Merge pull request #289 from jmbuena:master
authorAndrey Kamaev <andrey.kamaev@itseez.com>
Wed, 16 Jan 2013 13:01:00 +0000 (17:01 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Wed, 16 Jan 2013 13:01:00 +0000 (17:01 +0400)

Trivial merge