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)
     and '6f8490048134c6e6b72e44c0685e72338477cc2a'


Trivial merge