Merge pull request #2085 from severin-lemaignan:emscripten
authorRoman Donchenko <roman.donchenko@itseez.com>
Mon, 30 Dec 2013 13:56:59 +0000 (17:56 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Mon, 30 Dec 2013 13:57:00 +0000 (17:57 +0400)

Trivial merge