Merge pull request #295 from apavlenko:test_surf_keypoints_invariance
authorAndrey Kamaev <andrey.kamaev@itseez.com>
Wed, 23 Jan 2013 10:40:04 +0000 (14:40 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Wed, 23 Jan 2013 10:40:05 +0000 (14:40 +0400)

Trivial merge