merge of 'b384c5e2d3593861ccd01660d94e43bb59e544f5'
authorPhil Blundell <philb@gnu.org>
Thu, 21 Aug 2008 20:08:01 +0000 (20:08 +0000)
committerPhil Blundell <philb@gnu.org>
Thu, 21 Aug 2008 20:08:01 +0000 (20:08 +0000)
     and 'c6e676976a508cca50994dea712f87c53dd64c2e'


Trivial merge