Merge pull request #1907 from severin-lemaignan:emscripten-2.4
authorRoman Donchenko <roman.donchenko@itseez.com>
Tue, 3 Dec 2013 09:38:10 +0000 (13:38 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Tue, 3 Dec 2013 09:38:10 +0000 (13:38 +0400)

Trivial merge