merge of '4f76054a2fbe49f396cba8a3b6ef23027b6eb15d'
authorPhil Blundell <philb@gnu.org>
Wed, 17 Jan 2007 15:24:31 +0000 (15:24 +0000)
committerPhil Blundell <philb@gnu.org>
Wed, 17 Jan 2007 15:24:31 +0000 (15:24 +0000)
commitf305f4b21e651b8bc5cadc79720592302815edf9
tree9d01cb33af94594846ba9969db765faf92aae26f
parenteb9def83a75c134d31e2143cf2e89132527a5b45
parent3a508238c49e86e0476319bfe71a24fdfdd56b66
Merge ... '4f76054a2fbe49f396cba8a3b6ef23027b6eb15d'
     and '77df6e755fc8272db3fd5e4c3b0620b4453ca180'