merge of '49465eb4802528a82351dde4e4be56819267526e'
authorPhil Blundell <philb@gnu.org>
Mon, 22 Jan 2007 09:45:55 +0000 (09:45 +0000)
committerPhil Blundell <philb@gnu.org>
Mon, 22 Jan 2007 09:45:55 +0000 (09:45 +0000)
     and '8ebde0d924303d9679c25c10e4671740f5d732bb'


Trivial merge