merge of 'bea143d94e8d276b8e97bf1f82928984f2ac040a'
authorKoen Kooi <koen@openembedded.org>
Mon, 28 Aug 2006 21:55:22 +0000 (21:55 +0000)
committerKoen Kooi <koen@openembedded.org>
Mon, 28 Aug 2006 21:55:22 +0000 (21:55 +0000)
commit8da48eaf0ed3faf44ae043f5521872e08b35ad82
tree730b8f9e686c7753d9047efead0d101c0514e5ae
parentfef0035db932ea55dc0783e175aa6ee359bffb84
parent6346207824a03f13f4915618729814f30ecc816f
Merge ... 'bea143d94e8d276b8e97bf1f82928984f2ac040a'
     and 'fc1c689a5d9b893171f7d1effdb3acf96ea757df'