# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1379510827 -7200
# Node ID b26a7c397c34b82518a7b78d27ef9ce0e979e8af
# Parent  f6e61e329bbfeb14e338d72111dc0e240b7c92ee# Parent  11fee43c586106d01cd8b396938a45c422038da1
merge