Merge pull request #2096 from kamjagin:master
authorRoman Donchenko <roman.donchenko@itseez.com>
Tue, 31 Dec 2013 07:53:24 +0000 (11:53 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Tue, 31 Dec 2013 07:53:25 +0000 (11:53 +0400)

Trivial merge