Merge pull request #617 from moshekaplan:master
authorcuda-geek <marina.kolpakova@itseez.com>
Tue, 5 Mar 2013 04:56:57 +0000 (08:56 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Tue, 5 Mar 2013 04:56:58 +0000 (08:56 +0400)

Trivial merge