Merge pull request #1944 from ilya-lavrenov:minor_commits
authorAndrey Pavlenko <andrey.pavlenko@itseez.com>
Mon, 9 Dec 2013 08:44:25 +0000 (12:44 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Mon, 9 Dec 2013 08:44:26 +0000 (12:44 +0400)

Trivial merge