Merge pull request #413 from berak:master
authorAndrey Kamaev <andrey.kamaev@itseez.com>
Mon, 4 Feb 2013 08:56:12 +0000 (12:56 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Mon, 4 Feb 2013 08:56:12 +0000 (12:56 +0400)

Trivial merge