merge of '93e88a1c0fbbb69dbad706857468d431d612b9c9'
authorPhil Blundell <philb@gnu.org>
Sat, 2 Aug 2008 08:54:39 +0000 (08:54 +0000)
committerPhil Blundell <philb@gnu.org>
Sat, 2 Aug 2008 08:54:39 +0000 (08:54 +0000)
commit5850aeeb7d0ccf93e6845855ba9a696016ff6fa7
treeece4aed51122c2c1939cbfce74f597818e1645a0
parentc8cfa9c46c4b5d0b0657af80b1681b599ae051da
parent51736105a6c9705469589743ab05444cbd3c16f0
Merge ... '93e88a1c0fbbb69dbad706857468d431d612b9c9'
     and 'f7aee16bb45052647fd1a8b8b1d5617ec91b95a9'