Merge pull request #618 from caotto:master
authorcuda-geek <marina.kolpakova@itseez.com>
Tue, 5 Mar 2013 09:12:38 +0000 (13:12 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Tue, 5 Mar 2013 09:12:39 +0000 (13:12 +0400)

Trivial merge