Merge pull request #1495 from StevenPuttemans:bugfix_3282
authorAndrey Pavlenko <andrey.pavlenko@itseez.com>
Tue, 29 Oct 2013 06:51:00 +0000 (10:51 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Tue, 29 Oct 2013 06:51:01 +0000 (10:51 +0400)

Trivial merge