Merge pull request #344 from taka-no-me:improve_jpeg_encoder_errors
authorAndrey Kamaev <andrey.kamaev@itseez.com>
Mon, 28 Jan 2013 19:56:01 +0000 (23:56 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Mon, 28 Jan 2013 19:56:01 +0000 (23:56 +0400)

Trivial merge