Merge pull request #293 from taka-no-me:libjpeg9
authorAndrey Kamaev <andrey.kamaev@itseez.com>
Wed, 16 Jan 2013 12:08:06 +0000 (16:08 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Wed, 16 Jan 2013 12:08:07 +0000 (16:08 +0400)

Trivial merge