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)
commit1da45933698256b4dd8024aaa9c5f9ef76d82cf8
treee24f28915f89bb8658b9d07b415b39e038e039d7
parent34ba4b814e7922e6d32adaa76ec00001a977ddd7
parent10347e09692baa998b8be76ce139f214292e2eb1
Merge ... 'a168d537f470c511ba24d39191d37b97fb4bf2c2'
     and 'ee5fc7606ee238c94493b08405d3802b6f550a5b'