# HG changeset patch
# User Flick
# Date 1312586893 25200
# Node ID 30c9bdaad7a32ef7bb5fde5202ebb5a4a9957a68
# Parent  54d7865baae99826d7337c911c2bfb3d2c485401# Parent  7c596a5951eeb1434823e6b8dc23e9d0aa1cbec5
merge 1.1 beta 10 to stable