merge of 'b384c5e2d3593861ccd01660d94e43bb59e544f5'
authorPhil Blundell <philb@gnu.org>
Thu, 21 Aug 2008 20:08:01 +0000 (20:08 +0000)
committerPhil Blundell <philb@gnu.org>
Thu, 21 Aug 2008 20:08:01 +0000 (20:08 +0000)
commit2c2c74a5392a84d7e1a1c7956816c05a4e6cf812
treebb582214ce78fd0201fdaf6e4d9b221109dee319
parent72ee70604b162b8097ffa1fdc7ddd5945c69452a
parent53b0ec9989097170b359d19ddff4df55211eb733
Merge ... 'b384c5e2d3593861ccd01660d94e43bb59e544f5'
     and 'c6e676976a508cca50994dea712f87c53dd64c2e'