Merge pull request #2832 from BRAINSia:20140605_Upstream
authorRoman Donchenko <roman.donchenko@itseez.com>
Thu, 19 Jun 2014 07:57:51 +0000 (11:57 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Thu, 19 Jun 2014 07:57:52 +0000 (11:57 +0400)

Trivial merge