merge of '1bd825374fa13ede0bf18088241b5f6082e92e36'
authorKoen Kooi <koen@openembedded.org>
Sat, 11 Aug 2007 10:46:52 +0000 (10:46 +0000)
committerKoen Kooi <koen@openembedded.org>
Sat, 11 Aug 2007 10:46:52 +0000 (10:46 +0000)
commit05991c5873530c5b7233e334d3d07323fc061b0c
treed4751ced14c66c412a4532573d9313bacba559bb
parent3552ae7c26cc0e017cb445519d1e934ffc69b90e
parent1a623a280c109123fcf4baab96b5058d126fc9b5
Merge ... '1bd825374fa13ede0bf18088241b5f6082e92e36'
     and 'e7f9cc8373c592db0fd5e595010f3aaf8a3b0890'