Merge pull request #1144 from prclibo:master
authorRoman Donchenko <roman.donchenko@itseez.com>
Thu, 18 Jul 2013 12:05:39 +0000 (16:05 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Thu, 18 Jul 2013 12:05:40 +0000 (16:05 +0400)

Trivial merge