merge of 'a168d537f470c511ba24d39191d37b97fb4bf2c2'
authorPhil Blundell <philb@gnu.org>
Thu, 25 Jan 2007 17:57:09 +0000 (17:57 +0000)
committerPhil Blundell <philb@gnu.org>
Thu, 25 Jan 2007 17:57:09 +0000 (17:57 +0000)
     and 'ee5fc7606ee238c94493b08405d3802b6f550a5b'


Trivial merge