Merge pull request #2051 from AlexWillisson:patch-2
authorRoman Donchenko <roman.donchenko@itseez.com>
Wed, 25 Dec 2013 09:14:13 +0000 (13:14 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Wed, 25 Dec 2013 09:14:14 +0000 (13:14 +0400)

Trivial merge