# HG changeset patch
# User Flick
# Date 1307815020 25200
# Node ID 77609bfa804e4b983522b976881f0fff9bac7e07
# Parent  71d1a5e47e7285375422fcee0577bb6d856d4154# Parent  855521204ae964daf2fcb6b82971953162418a69
Merge 1.1 beta 8 to stable