Merge pull request #2110 from hmax:master
authorAndrey Pavlenko <andrey.pavlenko@itseez.com>
Thu, 23 Jan 2014 10:37:33 +0000 (14:37 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Thu, 23 Jan 2014 10:37:34 +0000 (14:37 +0400)

Trivial merge