# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1275987308 -3600
# Node ID f1669336617b91be28dbbe9109587a8b551cfa13
# Parent  8cab71dc5725cd4eddead17e2c4e88e5eda5a442# Parent  81d8da31c542ff956405ca056e571d10a4bc498f
Merge with stable