merge of '81d8dc81a1a7a826e84a23750afa2f81bb4c8787'
authorRichard Purdie <rpurdie@rpsys.net>
Thu, 28 Feb 2008 11:47:36 +0000 (11:47 +0000)
committerRichard Purdie <rpurdie@rpsys.net>
Thu, 28 Feb 2008 11:47:36 +0000 (11:47 +0000)
commit81d59df280284eb7e72f16aff290f238a88204db
treed19ef61e82eca62d59d29958ae21617fa755568e
parentacf313c21359e68fcba042d80ea0e0353aae7b92
parentf7f978ec4687b54a09967df27fbbce9a399d9cff
Merge ... '81d8dc81a1a7a826e84a23750afa2f81bb4c8787'
     and 'f3ce42d6e8e15e51ce97fef93a3948da8fedc3ad'