# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1335715122 -3600
# Node ID bd418e7e2d294301acaccde7ff23c48afca73766
# Parent  a3385251155855a6256caea5a44511b6cfff68c4# Parent  c1d229864cd37345a90a1c42697e695de7ba91ae
Merge with stable