Merge pull request #400 from ilysenkov:bugfix_2560
authorAndrey Kamaev <andrey.kamaev@itseez.com>
Fri, 1 Feb 2013 08:05:48 +0000 (12:05 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Fri, 1 Feb 2013 08:05:48 +0000 (12:05 +0400)

Trivial merge