# HG changeset patch # User Christian Ebert # Date 1272637809 -7200 # Node ID a3594a64511fe8e3f390683b879a3cbf6e3d69c6 # Parent dc8fe24c628e700bf214c49632df8b3dd6d02ca1# Parent e5bfe51eeea9b9603eab3871617add68ba3ae246 Merge with stable