Merge pull request #2311 from SvenWe:master
authorRoman Donchenko <roman.donchenko@itseez.com>
Tue, 11 Feb 2014 13:11:06 +0000 (17:11 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Tue, 11 Feb 2014 13:11:06 +0000 (17:11 +0400)

Trivial merge