Merging pull request #162 from taka-no-me/opencv
authorAndrey Kamaev <andrey.kamaev@itseez.com>
Tue, 20 Nov 2012 13:33:33 +0000 (17:33 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Tue, 20 Nov 2012 13:33:34 +0000 (17:33 +0400)

Trivial merge