Merge pull request #1653 from jlblancoc:master
authorRoman Donchenko <roman.donchenko@itseez.com>
Tue, 22 Oct 2013 09:53:11 +0000 (13:53 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Tue, 22 Oct 2013 09:53:12 +0000 (13:53 +0400)

Trivial merge