merge of '8d10c91e573e5f95d7f6c9de10c44d2f781256ea'
authorPhil Blundell <philb@gnu.org>
Fri, 22 Aug 2008 07:49:18 +0000 (07:49 +0000)
committerPhil Blundell <philb@gnu.org>
Fri, 22 Aug 2008 07:49:18 +0000 (07:49 +0000)
     and 'bfe45d9f35805a1e228c2ef0444ed97398cdd923'


Trivial merge