# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1402471087 -7200
# Node ID fc34356283e17432848ce82de1698b7104fb4489
# Parent  d256f69e63918c2a516917d86c19fd0bdab6b8b3# Parent  7ebd1a94be9df74cda3db9960af6e4ff7316849a
integration jpeg -> mainline