# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1319472130 -3600
# Node ID 5c25b505ffc1a0a7a0f663f4b2bf0807a22fd8cd
# Parent  e50f10baa81a9eb6897d42ac6fda1c3edf6801b3# Parent  dadecc4f3341bb50749a3e67c12724eec6801bdb
Merge with stable