Merge pull request #1180 from nghiaho12:master
authorRoman Donchenko <roman.donchenko@itseez.com>
Thu, 25 Jul 2013 08:04:09 +0000 (12:04 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Thu, 25 Jul 2013 08:04:09 +0000 (12:04 +0400)

Trivial merge