Merge pull request #966 from berak:master
authorRoman Donchenko <roman.donchenko@itseez.com>
Tue, 11 Jun 2013 14:17:07 +0000 (18:17 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Tue, 11 Jun 2013 14:17:07 +0000 (18:17 +0400)

Trivial merge