# HG changeset patch # User Christian Ebert # Date 1261649749 0 # Node ID 629956d13cbcdd11f00fa80efcf8a7d6c55bdfd4 # Parent 06ccaeb6cfc15849da11a0873200dc50a54bffeb# Parent 80d0ed025a02fdb94b1cf00f242d2cfd2fcfefb9 (stable) merge