Merge pull request #796 from SpecLad:more-backports
authorAndrey Kamaev <andrey.kamaev@itseez.com>
Thu, 11 Apr 2013 11:48:16 +0000 (15:48 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Thu, 11 Apr 2013 11:48:17 +0000 (15:48 +0400)

Trivial merge