Merge pull request #1496 from shawke:patch-1
authorAlexander Smorkalov <alexander.smorkalov@itseez.com>
Wed, 25 Sep 2013 07:29:46 +0000 (11:29 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Wed, 25 Sep 2013 07:29:46 +0000 (11:29 +0400)

Trivial merge