# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1306549156 -3600
# Node ID fee93dd51b18e7cb88aa26638056e3c716dfd69b
# Parent  12a2b9b99beba9e45efaba5f091fa2195f9053c4# Parent  e763012a55e5680a91d7e3e7bd9a3c2a19cc4cfa
Merge with stable