Merge pull request #540 from hgaspar:244
authorAndrey Kamaev <andrey.kamaev@itseez.com>
Mon, 25 Feb 2013 10:03:35 +0000 (14:03 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Mon, 25 Feb 2013 10:03:36 +0000 (14:03 +0400)

Trivial merge