Merge pull request #2777 from alexstadnik:master
authorRoman Donchenko <roman.donchenko@itseez.com>
Thu, 29 May 2014 10:43:30 +0000 (14:43 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Thu, 29 May 2014 10:43:30 +0000 (14:43 +0400)

Trivial merge