# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1276165981 -3600
# Node ID 36f51ccd65d3dc30d8cb4591c161bfa8080fbd58
# Parent  c5badbf855dbfcaaa26b069915f390da81ab04e4# Parent  0492a5acf652ba3a7d0199d11f78a54e45b61bcc
Merge with stable