# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1263978876 -3600
# Node ID 56bc2e01e08ea1136f85bff5b6298a9dbfc75575
# Parent  80d0ed025a02fdb94b1cf00f242d2cfd2fcfefb9# Parent  0efa9d6ac11f08e8dcb6b2e58c466bfe4e652907
Merge with stable