Merge pull request #1054 from asmorkalov:opencv_version
authorRoman Donchenko <roman.donchenko@itseez.com>
Fri, 28 Jun 2013 07:29:54 +0000 (11:29 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Fri, 28 Jun 2013 07:29:55 +0000 (11:29 +0400)

Trivial merge