# HG changeset patch # User Daniele Nicolodi # Date 1325008804 -3600 # Node ID 863e3e81498c5dba5904d4930e05b021a04732f6 # Parent 16f095c747066dcfe0d2525dc09562c5dd2416c0# Parent fbfd3129fe4d34a158b9249c84f8bc4bd67ce7d9 Merge with stable