merge of '2a251a71a9f271e9e3c90442f4664989c4200546'
authorPhil Blundell <philb@gnu.org>
Mon, 14 Aug 2006 16:07:24 +0000 (16:07 +0000)
committerPhil Blundell <philb@gnu.org>
Mon, 14 Aug 2006 16:07:24 +0000 (16:07 +0000)
     and 'be32f635579fe38afb045ac1745953ca97f2f55a'


Trivial merge