Merge pull request #1260 from SpecLad:no-cr-master
authorRoman Donchenko <roman.donchenko@itseez.com>
Tue, 13 Aug 2013 12:00:20 +0000 (16:00 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Tue, 13 Aug 2013 12:00:20 +0000 (16:00 +0400)

Trivial merge