merge of '395d8c1ab96c40659f7304c72a28982ec1a4f0f9'
authorPhil Blundell <philb@gnu.org>
Sun, 13 Aug 2006 14:00:45 +0000 (14:00 +0000)
committerPhil Blundell <philb@gnu.org>
Sun, 13 Aug 2006 14:00:45 +0000 (14:00 +0000)
commit4cfad8714d3f50c6c1a1808e9bdd8ddca72ea64b
tree8a6dd4371941591c13326e9503faf2a55d9a6c12
parent5240bd311339bb7ebfe9ef7e30f17475e9e2be8c
parent3a04c6da6ad2c135d83c7f0ef29aac23d7e0a3d4
Merge ... '395d8c1ab96c40659f7304c72a28982ec1a4f0f9'
     and 'fb1f22c1f370716bb4047f4959e9a5babc1f47f8'