merge of '2b438b3f55a45490f30d36bd6006d73826a40b2e'
authorKoen Kooi <koen@openembedded.org>
Tue, 3 Jul 2007 15:57:22 +0000 (15:57 +0000)
committerKoen Kooi <koen@openembedded.org>
Tue, 3 Jul 2007 15:57:22 +0000 (15:57 +0000)
commit9a3be9e1943af1c7e54781e5de8d91794d3528bc
treea31df108c88db3af5eb3eade01ff5086a4361571
parentadbeda42efdf1af393fd30df8aeda20e7dfc0960
parent483e49649eedf880d3fbe8247a6330b2b3b0965b
Merge ... '2b438b3f55a45490f30d36bd6006d73826a40b2e'
     and '820c91664f0da9157d80383ae442fbebb356aab7'