Merge pull request #1448 from StevenPuttemans:bugfix_3264
authorAlexander Smorkalov <alexander.smorkalov@itseez.com>
Fri, 20 Sep 2013 06:55:23 +0000 (10:55 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Fri, 20 Sep 2013 06:55:24 +0000 (10:55 +0400)

Trivial merge