Merge pull request #2014 from krodyush:pullreq/2.4-opt-131211-surf
authorAndrey Pavlenko <andrey.pavlenko@itseez.com>
Fri, 20 Dec 2013 12:50:00 +0000 (16:50 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Fri, 20 Dec 2013 12:50:00 +0000 (16:50 +0400)

Trivial merge