Merge pull request #653 from jbohren-forks:master
authorcuda-geek <marina.kolpakova@itseez.com>
Mon, 18 Mar 2013 09:10:24 +0000 (13:10 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Mon, 18 Mar 2013 09:10:25 +0000 (13:10 +0400)

Trivial merge