Merge pull request #1863 from nevion:master
authorRoman Donchenko <roman.donchenko@itseez.com>
Tue, 26 Nov 2013 09:53:47 +0000 (13:53 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Tue, 26 Nov 2013 09:53:48 +0000 (13:53 +0400)

Trivial merge