merge of '4f76054a2fbe49f396cba8a3b6ef23027b6eb15d'
authorPhil Blundell <philb@gnu.org>
Wed, 17 Jan 2007 15:24:31 +0000 (15:24 +0000)
committerPhil Blundell <philb@gnu.org>
Wed, 17 Jan 2007 15:24:31 +0000 (15:24 +0000)
     and '77df6e755fc8272db3fd5e4c3b0620b4453ca180'


Trivial merge