merge of '6c6d6fcd3941c653a9ea8f2a3ebf593147530821'
authorRichard Purdie <rpurdie@rpsys.net>
Mon, 20 Nov 2006 14:35:15 +0000 (14:35 +0000)
committerRichard Purdie <rpurdie@rpsys.net>
Mon, 20 Nov 2006 14:35:15 +0000 (14:35 +0000)
commit4e783b87509f89e1d024450de05acacbfeed4dda
tree977ca2d76241fded8e4a033c503587fd55dbd752
parentd5acf6b0ab977d9eeb93a6f6402f28c12645474d
parent2f89dfc60879af757da4ff8ddfd3a55e776be8d4
Merge ... '6c6d6fcd3941c653a9ea8f2a3ebf593147530821'
     and 'af4fef7c47a7bd9d53b690340e39ebeaddaf676e'