# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1319294628 -3600
# Node ID df7e78af0d9fe4ff974d73b13d6e830ca3e0e89b
# Parent  ab082912af32141fb0e3fc4b1bca2ff51069239f# Parent  68475648cd7e889535bbc4e85be1992f48680fa6
Merge with stable