Merge pull request #2400 from RJ2:Bugfix_2
authorRoman Donchenko <roman.donchenko@itseez.com>
Fri, 21 Mar 2014 09:58:05 +0000 (13:58 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Fri, 21 Mar 2014 09:58:06 +0000 (13:58 +0400)

Trivial merge