Merge pull request #2463 from ziyangli:master
authorRoman Donchenko <roman.donchenko@itseez.com>
Wed, 12 Mar 2014 14:51:40 +0000 (18:51 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Wed, 12 Mar 2014 14:51:41 +0000 (18:51 +0400)

Trivial merge