# HG changeset patch
# User Jon Chatten
# Date 1269605169 0
# Node ID 698b9b7141d78003955e0dba7a6d6ab23ea5558e
# Parent  d84804af662b873e914a7b5cb1aee5f96813b0aa# Parent  2fda6cb4a81254de2e2d96291fa5a8309291aa25
merge from wip

diff -r 2fda6cb4a812 -r 698b9b7141d7 .hgtags
--- a/.hgtags	Fri Mar 26 12:02:49 2010 +0000
+++ b/.hgtags	Fri Mar 26 12:06:09 2010 +0000
@@ -3,3 +3,5 @@
 007900c31eef0363e705cf15d131740d4eeb6208 stable
 007900c31eef0363e705cf15d131740d4eeb6208 stable
 976aca38ffe5ce30d7753ea77a8de44e5cbd0dc8 stable
+976aca38ffe5ce30d7753ea77a8de44e5cbd0dc8 stable
+7006bcce52990f33d0c20c51bebc2b58ed36db60 stable