merge of '0f42cd616108360d027b0381a276d5b1a3cf26fa'
authorPhil Blundell <philb@gnu.org>
Sun, 27 Jul 2008 10:46:02 +0000 (10:46 +0000)
committerPhil Blundell <philb@gnu.org>
Sun, 27 Jul 2008 10:46:02 +0000 (10:46 +0000)
     and '1be001dbcc12db3d86ea2666b2fde9a5fa4bddb6'


Trivial merge