# HG changeset patch # User Christian Ebert # Date 1289923146 -3600 # Node ID de49207ef1a566442c0b4d1f11340fd24d3c1d1b # Parent bbb042e55f49f75086707e87fcc7a4fa8f61fcc5# Parent c333552ec003b620cc38a7e2ee8c745d8b13e704 Merge with stable