# HG changeset patch
# User Flick
# Date 1304722341 25200
# Node ID d2e55b61e5e6d96b515db2a9b6aef862f3b7b5af
# Parent  a7d2efb6ffc9e7dee05b676a72d53182ec1f2ca0# Parent  e0071c480445235e6d01384b18e014c05cf67680
Merge 1.1 beta 6 to stable

diff -r e0071c480445 -r d2e55b61e5e6 .hgtags
--- a/.hgtags	Fri May 06 15:51:36 2011 -0700
+++ b/.hgtags	Fri May 06 15:52:21 2011 -0700
@@ -1,7 +1,6 @@
 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
 455ef506f9695045737410a6529c9c6eb7d33022 1.1 beta 5
 b2e401183d36cd1283df64eef68a92a9ce08cc46 1.1 beta 6