Merge pull request #360 from vpisarev:sift_fixes
authorAndrey Kamaev <andrey.kamaev@itseez.com>
Tue, 29 Jan 2013 16:39:13 +0000 (20:39 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Tue, 29 Jan 2013 16:39:13 +0000 (20:39 +0400)

Trivial merge