Merge pull request #2390 from nicolasmartin3d:master_bug3546
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Thu, 10 Apr 2014 09:33:42 +0000 (13:33 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Thu, 10 Apr 2014 09:33:43 +0000 (13:33 +0400)

Trivial merge