Merge pull request #1342 from nevion:master
authorRoman Donchenko <roman.donchenko@itseez.com>
Wed, 28 Aug 2013 08:00:39 +0000 (12:00 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Wed, 28 Aug 2013 08:00:39 +0000 (12:00 +0400)

Trivial merge