merge of '395d8c1ab96c40659f7304c72a28982ec1a4f0f9'
authorPhil Blundell <philb@gnu.org>
Sun, 13 Aug 2006 14:00:45 +0000 (14:00 +0000)
committerPhil Blundell <philb@gnu.org>
Sun, 13 Aug 2006 14:00:45 +0000 (14:00 +0000)
     and 'fb1f22c1f370716bb4047f4959e9a5babc1f47f8'


Trivial merge