Merge pull request #2337 from pmoulon:master
authorRoman Donchenko <roman.donchenko@itseez.com>
Mon, 17 Feb 2014 08:24:48 +0000 (12:24 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Mon, 17 Feb 2014 08:24:48 +0000 (12:24 +0400)

Trivial merge