Merge pull request #266 from prclibo:master
authorAndrey Kamaev <andrey.kamaev@itseez.com>
Fri, 28 Dec 2012 08:51:34 +0000 (12:51 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Fri, 28 Dec 2012 08:51:34 +0000 (12:51 +0400)

Trivial merge