merge of '3a0cedcbc0fec5fa2d459675679087748945554a'
authorPhil Blundell <philb@gnu.org>
Wed, 6 Aug 2008 16:23:06 +0000 (16:23 +0000)
committerPhil Blundell <philb@gnu.org>
Wed, 6 Aug 2008 16:23:06 +0000 (16:23 +0000)
     and '542045dc0960cdd026c811bc69c1db6934531925'


Trivial merge