Merge pull request #489 from jet47:carma-obsolete
authorAndrey Kamaev <andrey.kamaev@itseez.com>
Thu, 14 Feb 2013 14:20:30 +0000 (18:20 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Thu, 14 Feb 2013 14:20:31 +0000 (18:20 +0400)

Trivial merge