# HG changeset patch
# User Dirkjan Ochtman <dirkjan@ochtman.nl>
# Date 1229848855 -3600
# Node ID 3896310bd797a3c0db22654321e88db9cc73d3e7
# Parent  f1069e7f5635ff4b57b1f4dd4c12860f8403a4ca# Parent  45b79d3e393e534447280b01c0e0698478fdc3ca
merge with stable

diff -r f1069e7f5635 -r 3896310bd797 .hgsigs
--- a/.hgsigs	Sat Dec 20 13:09:05 2008 +0100
+++ b/.hgsigs	Sun Dec 21 09:40:55 2008 +0100
@@ -8,3 +8,4 @@
 d5cbbe2c49cee22a9fbeb9ea41daa0ac4e26b846 0 iD8DBQBINdwsywK+sNU5EO8RAjIUAKCPmlFJSpsPAAUKF+iNHAwVnwmzeQCdEXrL27CWclXuUKdbQC8De7LICtE=
 d2375bbee6d47e62ba8e415c86e83a465dc4dce9 0 iD8DBQBIo1wpywK+sNU5EO8RAmRNAJ94x3OFt6blbqu/yBoypm/AJ44fuACfUaldXcV5z9tht97hSp22DVTEPGc=
 2a67430f92f15ea5159c26b09ec4839a0c549a26 0 iEYEABECAAYFAkk1hykACgkQywK+sNU5EO85QACeNJNUanjc2tl4wUoPHNuv+lSj0ZMAoIm93wSTc/feyYnO2YCaQ1iyd9Nu
+3773e510d433969e277b1863c317b674cbee2065 0 iEYEABECAAYFAklNbbAACgkQywK+sNU5EO8o+gCfeb2/lfIJZMvyDA1m+G1CsBAxfFsAoIa6iAMG8SBY7hW1Q85Yf/LXEvaE
diff -r f1069e7f5635 -r 3896310bd797 .hgtags
--- a/.hgtags	Sat Dec 20 13:09:05 2008 +0100
+++ b/.hgtags	Sun Dec 21 09:40:55 2008 +0100
@@ -20,3 +20,4 @@
 d5cbbe2c49cee22a9fbeb9ea41daa0ac4e26b846 1.0.1
 d2375bbee6d47e62ba8e415c86e83a465dc4dce9 1.0.2
 2a67430f92f15ea5159c26b09ec4839a0c549a26 1.1
+3773e510d433969e277b1863c317b674cbee2065 1.1.1