merge of '79771edb5b4d45a18e509f01db9c473d1aa63962'
authorKoen Kooi <koen@openembedded.org>
Tue, 31 Jul 2007 16:17:12 +0000 (16:17 +0000)
committerKoen Kooi <koen@openembedded.org>
Tue, 31 Jul 2007 16:17:12 +0000 (16:17 +0000)
commit47e08a376ae43189fb400a7f53aba3e60c67c7a7
treef7bf3806eaeb5729d19bb4ea8bea98046a5085b5
parent3aecefc3fec909cf0b8208a345b98be27de068aa
parent2e61dfe7129ee23bc41ba1ada89eedf3245a16ca
Merge ... '79771edb5b4d45a18e509f01db9c473d1aa63962'
     and '835bda37b996295e3fb4a19b2f3d71f25cd0abca'