Merge pull request #1079 from AlexeySpizhevoy:master
authorAndrey Pavlenko <andrey.pavlenko@itseez.com>
Mon, 5 Aug 2013 06:54:43 +0000 (10:54 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Mon, 5 Aug 2013 06:54:44 +0000 (10:54 +0400)

Trivial merge