# HG changeset patch # User Christian Ebert # Date 1259345009 0 # Node ID 55e769bd66f76bb0b1f69297ae86027194616e09 # Parent 55453609c3d403f66b5f21e34e4618d54940dc40# Parent 583a0371249cec33023216d6aa61a984abecf6f8 Merge with stable