Merge pull request #1080 from hhofbaue:matchTemplate_bugfix
authorRoman Donchenko <roman.donchenko@itseez.com>
Wed, 10 Jul 2013 14:17:06 +0000 (18:17 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Wed, 10 Jul 2013 14:17:06 +0000 (18:17 +0400)

Trivial merge