# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1246462596 -7200
# Node ID b5eb8a9938aae63b754601b9ce79483f525c2f49
# Parent  4362f0ef265a972f287ee21030b7c38c96cecc5f# Parent  b40e7861defdc9d1f1fead4e300f5dab7464f005
(stable) merge