merge of '1e7e45502df6c52d725444e6655b368305ffe8d6'
authorPhil Blundell <philb@gnu.org>
Sun, 3 Aug 2008 11:14:32 +0000 (11:14 +0000)
committerPhil Blundell <philb@gnu.org>
Sun, 3 Aug 2008 11:14:32 +0000 (11:14 +0000)
     and '6690ff49b103de5f60ddc09faaed43726adb4506'


Trivial merge