Merge pull request #273 from saskathex:master
authorAndrey Kamaev <andrey.kamaev@itseez.com>
Sat, 29 Dec 2012 11:03:50 +0000 (15:03 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Sat, 29 Dec 2012 11:03:50 +0000 (15:03 +0400)

Trivial merge