Merge pull request #1011 from wecacuee:master
authorRoman Donchenko <roman.donchenko@itseez.com>
Thu, 27 Jun 2013 08:03:07 +0000 (12:03 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Thu, 27 Jun 2013 08:03:07 +0000 (12:03 +0400)

Trivial merge