merge of '47d9bffa351513f062299f9ac77e39b7bfe6d74f'
authorRichard Purdie <rpurdie@rpsys.net>
Sun, 27 Aug 2006 17:34:53 +0000 (17:34 +0000)
committerRichard Purdie <rpurdie@rpsys.net>
Sun, 27 Aug 2006 17:34:53 +0000 (17:34 +0000)
commit2101f6f377a76c373b5ef4ff2fb8484ab5d4d31f
tree1aa5a30cc595a67307d13a23584f88ae45003fca
parentf3e5a3eab0610d378a30a5688f29e277162635c1
parent69383bc09ea895755f1ed236c686e5c6cdf9ced7
Merge ... '47d9bffa351513f062299f9ac77e39b7bfe6d74f'
     and 'b4baa952a21796f3da8adaf6acd8c844668a33d8'