Merge pull request #2735 from StevenPuttemans:bug_2000
authorRoman Donchenko <roman.donchenko@itseez.com>
Mon, 19 May 2014 10:25:46 +0000 (14:25 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Mon, 19 May 2014 10:25:47 +0000 (14:25 +0400)

Trivial merge