merge of '93e88a1c0fbbb69dbad706857468d431d612b9c9'
authorPhil Blundell <philb@gnu.org>
Sat, 2 Aug 2008 08:54:39 +0000 (08:54 +0000)
committerPhil Blundell <philb@gnu.org>
Sat, 2 Aug 2008 08:54:39 +0000 (08:54 +0000)
     and 'f7aee16bb45052647fd1a8b8b1d5617ec91b95a9'


Trivial merge