Merge pull request #1464 from StevenPuttemans:bugfix_3186_second
authorAlexander Smorkalov <alexander.smorkalov@itseez.com>
Thu, 26 Sep 2013 08:16:01 +0000 (12:16 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Thu, 26 Sep 2013 08:16:02 +0000 (12:16 +0400)

Trivial merge