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

Trivial merge