Merge pull request #690 from berak:master
authorAndrey Kamaev <andrey.kamaev@itseez.com>
Fri, 22 Mar 2013 15:35:17 +0000 (19:35 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Fri, 22 Mar 2013 15:35:17 +0000 (19:35 +0400)

Trivial merge