# HG changeset patch
# User Flick
# Date 1309556148 25200
# Node ID 54d7865baae99826d7337c911c2bfb3d2c485401
# Parent  77609bfa804e4b983522b976881f0fff9bac7e07# Parent  9671965c7a585429c1c06c7004933319e5141330
Merge 1.1 beta 9 to stable