Merge pull request #427 from vrabaud:brisk_fixes_2.4
authorAndrey Kamaev <andrey.kamaev@itseez.com>
Mon, 4 Feb 2013 13:10:02 +0000 (17:10 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Mon, 4 Feb 2013 13:10:02 +0000 (17:10 +0400)

Trivial merge