# HG changeset patch
# User Flick
# Date 1352940447 28800
# Node ID 0211bcdfab70119fc0915f01f911368c6b15b73f
# Parent  30c9bdaad7a32ef7bb5fde5202ebb5a4a9957a68# Parent  c63d74f26c22b2e8a130caaffcf6fbaeacf50191
Merge 1.1 beta 12 to stable