Merge pull request #1911 from apavlenko:2.4_fix_vc12
authorAndrey Pavlenko <andrey.pavlenko@itseez.com>
Tue, 3 Dec 2013 15:20:04 +0000 (19:20 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Tue, 3 Dec 2013 15:20:05 +0000 (19:20 +0400)

Trivial merge