Merge pull request #2533 from kenaniah:master
authorRoman Donchenko <roman.donchenko@itseez.com>
Fri, 28 Mar 2014 08:08:23 +0000 (12:08 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Fri, 28 Mar 2014 08:08:23 +0000 (12:08 +0400)

Trivial merge