Merge pull request #1498 from alalek:revert_1487
authorAlexander Smorkalov <alexander.smorkalov@itseez.com>
Wed, 25 Sep 2013 07:27:25 +0000 (11:27 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Wed, 25 Sep 2013 07:27:26 +0000 (11:27 +0400)

Trivial merge