# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1402753802 -7200
# Node ID 50106e80555a1917d5d612a290534f96c26ec093
# Parent  b5f10a8c96a686cda4e0544dea0b91c643d4bdda# Parent  c9034d80775da2c0401b9d2081e68a06a55ddfd7
integration jpeg -> mainline