# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1265392656 0
# Node ID 9bdbae6007cbe4c33a983fff64410b9e5b0f1b44
# Parent  56bc2e01e08ea1136f85bff5b6298a9dbfc75575# Parent  c15f0019c15b3c8ca11340b56cd2b8bbce200204
Merge with stable