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)
commit78f0bd528fc92d169cc6de15e976a5e03275123d
tree127e6cd41d890a3c7b3c1f12625710a2747a68b6
parente0851eee5b7e54db524cd2bbd29bbf473ee4820b
parent0a395815112226458111aa55d6f1ab2d4de4ab6c
Merge ... '49465eb4802528a82351dde4e4be56819267526e'
     and '8ebde0d924303d9679c25c10e4671740f5d732bb'