Merge pull request #547 from vpisarev:fixes_244
authorAndrey Kamaev <andrey.kamaev@itseez.com>
Mon, 25 Feb 2013 21:00:36 +0000 (01:00 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Mon, 25 Feb 2013 21:00:36 +0000 (01:00 +0400)

Trivial merge