# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1246524961 -7200
# Node ID 474063ef3f3d2ca6f203a6955852b60054320a85
# Parent  b5eb8a9938aae63b754601b9ce79483f525c2f49# Parent  b21fe4c86037b5af8f9a5c35bf6bad872121b4b4
(stable) merge