# HG changeset patch
# User Richard Taylor <richard.i.taylor@nokia.com>
# Date 1269534022 0
# Node ID d84804af662b873e914a7b5cb1aee5f96813b0aa
# Parent  b8a82bb868e0d01e3afbe37c9370e30933c9cb66# Parent  dde9ce4a8aa8d78f03c1a90d83bf80bec2392d56
merge 2.13.0 from wip

diff -r dde9ce4a8aa8 -r d84804af662b .hgtags
--- a/.hgtags	Thu Mar 25 15:42:26 2010 +0000
+++ b/.hgtags	Thu Mar 25 16:20:22 2010 +0000
@@ -3,3 +3,5 @@
 007900c31eef0363e705cf15d131740d4eeb6208 stable
 007900c31eef0363e705cf15d131740d4eeb6208 stable
 976aca38ffe5ce30d7753ea77a8de44e5cbd0dc8 stable
+976aca38ffe5ce30d7753ea77a8de44e5cbd0dc8 stable
+7006bcce52990f33d0c20c51bebc2b58ed36db60 stable