Merge pull request #1184 from apacha:Descriptor_Docu_FREAK_added_2
authorRoman Donchenko <roman.donchenko@itseez.com>
Thu, 25 Jul 2013 08:00:55 +0000 (12:00 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Thu, 25 Jul 2013 08:00:55 +0000 (12:00 +0400)

Trivial merge