Merge pull request #2129 from ilya-lavrenov:mix_fix
authorRoman Donchenko <roman.donchenko@itseez.com>
Thu, 9 Jan 2014 13:04:03 +0000 (17:04 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Thu, 9 Jan 2014 13:04:03 +0000 (17:04 +0400)

Trivial merge