Merge pull request #1276 from nghiaho12:mushroom
authorRoman Donchenko <roman.donchenko@itseez.com>
Thu, 15 Aug 2013 08:05:01 +0000 (12:05 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Thu, 15 Aug 2013 08:05:02 +0000 (12:05 +0400)

Trivial merge