# HG changeset patch
# User Martin Geisler <mg@lazybytes.net>
# Date 1259620057 -3600
# Node ID 8c923a18e7ae142f20876b60efb2b0bbcc96e7b0
# Parent  963ed04a8fdea75f61c15973a019e90fc25085b7# Parent  0c3eeee91c9a88b497bcc480c7095f748da609dd
Merge with stable