merge of '73d0f834a1f30cd2998b071506e97af8d849f977'
authorPhil Blundell <philb@gnu.org>
Mon, 22 Jan 2007 09:49:26 +0000 (09:49 +0000)
committerPhil Blundell <philb@gnu.org>
Mon, 22 Jan 2007 09:49:26 +0000 (09:49 +0000)
     and 'a011f99d8663ce45f2473866131d2b49f5701ed5'


Trivial merge