Merge pull request #1246 from StevenPuttemans:bugfix_3206
authorRoman Donchenko <roman.donchenko@itseez.com>
Mon, 12 Aug 2013 07:57:39 +0000 (11:57 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Mon, 12 Aug 2013 07:57:39 +0000 (11:57 +0400)

Trivial merge