Merge pull request #1127 from SpecLad:np-1.7
authorRoman Donchenko <roman.donchenko@itseez.com>
Wed, 17 Jul 2013 14:48:07 +0000 (18:48 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Wed, 17 Jul 2013 14:48:08 +0000 (18:48 +0400)

Trivial merge