merge of '1cdff1496ac2d8d1eb68e3762f5ac4fd53c20924'
authorRichard Purdie <rpurdie@rpsys.net>
Sun, 17 Dec 2006 10:52:36 +0000 (10:52 +0000)
committerRichard Purdie <rpurdie@rpsys.net>
Sun, 17 Dec 2006 10:52:36 +0000 (10:52 +0000)
commitdb8fb05c672025788cac42c01fd30145de0119cc
tree71d5fa1600f18e49abbe28460c248cc40a71756f
parent1f5d884f31b9d70f5a8fa3f5610bb20e950968c3
parentd2b3087e41fd3f2bd98a4d37f085a007942801e3
Merge ... '1cdff1496ac2d8d1eb68e3762f5ac4fd53c20924'
     and 'af1d7cf6768b5e5205f07a7a63b6767971ccb1b7'