merge of 'a061abf4bdeedaccdb10ef3b7372827d261db509'
authorPhil Blundell <philb@gnu.org>
Fri, 1 Aug 2008 19:42:12 +0000 (19:42 +0000)
committerPhil Blundell <philb@gnu.org>
Fri, 1 Aug 2008 19:42:12 +0000 (19:42 +0000)
     and 'c6e91bf295f3be4e74e18520fdbb8aeb20908d3e'


Trivial merge