Merge pull request #2317 from blueskymonster:master
authorRoman Donchenko <roman.donchenko@itseez.com>
Wed, 12 Feb 2014 11:14:25 +0000 (15:14 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Wed, 12 Feb 2014 11:14:26 +0000 (15:14 +0400)

Trivial merge