merge of '42a6f62802ccaf34d8896404bd4683dc7111232f'
authorPhil Blundell <philb@gnu.org>
Tue, 15 Aug 2006 10:17:26 +0000 (10:17 +0000)
committerPhil Blundell <philb@gnu.org>
Tue, 15 Aug 2006 10:17:26 +0000 (10:17 +0000)
commitc7663d5163ee64710fa9e9a2406eb94fcc4cec61
treee74cf4dd80b23d6bfbb3729608041525e7b19cf7
parent5f7199374a50fe82f4d436ed507eea73b29f23fd
parent772c2ab08055ad87972bbeb00c3c78c801148ec0
Merge ... '42a6f62802ccaf34d8896404bd4683dc7111232f'
     and '6f8490048134c6e6b72e44c0685e72338477cc2a'