Merge pull request #932 from bitwangyaoyao:2.4_fixBFM
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Thu, 30 May 2013 08:21:26 +0000 (12:21 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Thu, 30 May 2013 08:21:27 +0000 (12:21 +0400)

Trivial merge