Merge pull request #1041 from abidrahmank:master
authorRoman Donchenko <roman.donchenko@itseez.com>
Wed, 26 Jun 2013 12:38:54 +0000 (16:38 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Wed, 26 Jun 2013 12:38:54 +0000 (16:38 +0400)

Trivial merge