Merge pull request #2126 from yinghau76:master
authorRoman Donchenko <roman.donchenko@itseez.com>
Thu, 9 Jan 2014 10:00:52 +0000 (14:00 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Thu, 9 Jan 2014 10:00:53 +0000 (14:00 +0400)

Trivial merge