merge of '8b788877676745843159ccb616b8159259af90f9'
authorPhil Blundell <philb@gnu.org>
Sun, 7 Sep 2008 16:00:12 +0000 (16:00 +0000)
committerPhil Blundell <philb@gnu.org>
Sun, 7 Sep 2008 16:00:12 +0000 (16:00 +0000)
     and 'dfbcb673122fc1ce8a4d1cfb9c2b2b67360f6fc8'


Trivial merge