Merge pull request #1171 from SpecLad:drop-legacy-options
authorRoman Donchenko <roman.donchenko@itseez.com>
Thu, 25 Jul 2013 08:05:36 +0000 (12:05 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Thu, 25 Jul 2013 08:05:36 +0000 (12:05 +0400)

Trivial merge