Merge pull request #1842 from StevenPuttemans:bugfix_3315
authorRoman Donchenko <roman.donchenko@itseez.com>
Mon, 25 Nov 2013 08:38:56 +0000 (12:38 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Mon, 25 Nov 2013 08:38:56 +0000 (12:38 +0400)

Trivial merge