Merge pull request #2554 from asmorkalov:ocv_249_version
authorRoman Donchenko <roman.donchenko@itseez.com>
Tue, 1 Apr 2014 08:16:25 +0000 (12:16 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Tue, 1 Apr 2014 08:16:25 +0000 (12:16 +0400)

Trivial merge