merge of 'a8fc829ccd7c5a7c71d76bac5c9f37e82d0b2ab5'
authorRichard Purdie <rpurdie@rpsys.net>
Sat, 1 Sep 2007 18:44:16 +0000 (18:44 +0000)
committerRichard Purdie <rpurdie@rpsys.net>
Sat, 1 Sep 2007 18:44:16 +0000 (18:44 +0000)
commit5ce0154bcbbb6ed2bd30d2ee204630ea98dd9b69
tree05a2d8527588826fe2a92ce99f7c1054451344c3
parentade5e03240462ee27f1e41f004f8f5e1d7ef8b36
parentd4ccb3ca3aeb070cbc983140d04fe6c186680025
Merge ... 'a8fc829ccd7c5a7c71d76bac5c9f37e82d0b2ab5'
     and 'ed77cd74b64e0454761e99d7c3b09c39ef2a97a9'