Merge pull request #1209 from nghiaho12:master
authorRoman Donchenko <roman.donchenko@itseez.com>
Tue, 1 Oct 2013 13:07:39 +0000 (17:07 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Tue, 1 Oct 2013 13:07:39 +0000 (17:07 +0400)

Trivial merge