# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1303769387 -3600
# Node ID 6f25a5834e14fa94034cd75ee8046265279621b4
# Parent  f3ab526d876103fddded8cf70286671fe53133c2# Parent  dd5c50a018b00d663cd7396ca47e32efa0d7deb9
Merge with stable