# HG changeset patch
# User Flick
# Date 1302649591 25200
# Node ID 920d17851a936226ba80de7b77f3904fa6490166
# Parent  b2b105747466f7dce63ee9296c59ef1d37f8802e# Parent  586447595262a1ab6733e8daba091052c1b8536c
Merge 1.1 beta 4 to stable

diff -r 586447595262 -r 920d17851a93 .hgtags
--- a/.hgtags	Sat Mar 26 12:46:06 2011 -0700
+++ b/.hgtags	Tue Apr 12 16:06:31 2011 -0700
@@ -1,5 +1,4 @@
 2c05008464e5cf809251d40c8f88ad87fa3ac554 1.1 Beta 1
 9945a783d8b29e6e81eb8d42823d56dc84759d15 1.1 Beta 2
-2c05008464e5cf809251d40c8f88ad87fa3ac554 1.1 Beta 1
-0000000000000000000000000000000000000000 1.1 Beta 1
+3e451836ce6dfa758794c27a4b3a2a1f12595e83 1.1 Beta 3
 47818b3938c912c19018419cb5738d4013107167 1.1 beta 4