# HG changeset patch
# User nemo
# Date 1369864567 14400
# Node ID ed8f6cc61884409cca2db6a28864d03b7cb32dd8
# Parent  7f04ad2cda541aeac613c8e0d57968c80a40b0cd# Parent  d971f88c71c0adf702f047149abd6799d1ea0ba9
merge with tip