# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1289214683 0
# Node ID d36150edc23154b19016a59aac2c325538860759
# Parent  3450d7f7d1a321d1965dff45aa5f65face5aeb40# Parent  ff1badf6ae7a1995c7eecb83831fdb88197a5da3
Merge with stable