Merge branch 'fix_jpg2000' into 2.4
authorAndrey Kamaev <andrey.kamaev@itseez.com>
Mon, 28 Jan 2013 08:41:35 +0000 (12:41 +0400)
committerAndrey Kamaev <andrey.kamaev@itseez.com>
Mon, 28 Jan 2013 08:41:35 +0000 (12:41 +0400)
commit8521ac5d2158571ef347aac89c533d3737d0e3a9
treed73ad19f0d4ff2eaf187672994d35466daca2c86
parentd8f749da5212ce0fe9d840e7d0d938895441fdd0
parente87355463f27702f5c398b22b05021f8290e5329
Merge branch 'fix_jpg2000' into 2.4