Merge pull request #2347 from Chechli:master
authorRoman Donchenko <roman.donchenko@itseez.com>
Tue, 18 Feb 2014 08:57:25 +0000 (12:57 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Tue, 18 Feb 2014 08:57:26 +0000 (12:57 +0400)

Trivial merge