merge of '4dfc78edd77f8873f466310c5aeb329cb95eb08e'
authorKoen Kooi <koen@openembedded.org>
Sun, 6 Aug 2006 13:00:11 +0000 (13:00 +0000)
committerKoen Kooi <koen@openembedded.org>
Sun, 6 Aug 2006 13:00:11 +0000 (13:00 +0000)
commit27900a482bcdafd387ed455e747fac95f8a74177
treef6cea01714369e5266a531c0e3f475cb040876d7
parente46b9eb91fa93a94580e274719f4c7d713eae6e2
parent688adcfc6b9e7d4e916b3e44566a32f98d36bce7
Merge ... '4dfc78edd77f8873f466310c5aeb329cb95eb08e'
     and '59db0e08dee38b700ad535721bd778414bd8b07c'