merge of '6b50eeffe6b0887666782f657e8f8fc694b7045c'
authorRichard Purdie <rpurdie@rpsys.net>
Mon, 20 Nov 2006 14:33:19 +0000 (14:33 +0000)
committerRichard Purdie <rpurdie@rpsys.net>
Mon, 20 Nov 2006 14:33:19 +0000 (14:33 +0000)
commit38712c59090394d295677f9a6d3fa019373f4ce5
treee56d8992a04be100c885287e9775d4272b5f49c2
parent5f77fcad0da4f8ea03b920b912f730dbcabf7018
parent02f125e6a40c1978258f5a0ae2937d642b4d6705
Merge ... '6b50eeffe6b0887666782f657e8f8fc694b7045c'
     and 'c647d36367af59b2cc5bdd6d28a4c0a873539f76'