# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1348910697 -7200
# Node ID 52ed88d3096a9fb6c56f6e5ee4d503929bbf8a48
# Parent  3f9569917745ee2e5b9dbb67fc3e635beb7655ef# Parent  5eaf1b69acd5ae459222849ef2fcb3808bf0e74d
integration to mainline