merge of '7022b2fb8c0b08d5f93f14844bb14a13991c7daa'
authorPhil Blundell <philb@gnu.org>
Thu, 18 Jan 2007 15:32:42 +0000 (15:32 +0000)
committerPhil Blundell <philb@gnu.org>
Thu, 18 Jan 2007 15:32:42 +0000 (15:32 +0000)
     and 'c77de7a09c5852f1bfe63afbd011ef701c76bdf6'


Trivial merge