merge of '42bf6e48b1c776ec48b21ce58948bf1ef7ae2fed'
authorPhil Blundell <philb@gnu.org>
Thu, 21 Aug 2008 21:14:49 +0000 (21:14 +0000)
committerPhil Blundell <philb@gnu.org>
Thu, 21 Aug 2008 21:14:49 +0000 (21:14 +0000)
     and '971150ae9b5ea5ece65d001e9966bb32966d3700'


Trivial merge