merge of '40faf7d48d883c5cd0bb74d8c212de805ef7cdf3'
authorKoen Kooi <koen@openembedded.org>
Fri, 7 Dec 2007 10:18:10 +0000 (10:18 +0000)
committerKoen Kooi <koen@openembedded.org>
Fri, 7 Dec 2007 10:18:10 +0000 (10:18 +0000)
commitc16ea23180e220831092ed326a3cfdf79517fd59
treebb8a392c28a25e2714a95c0e583d27d0e751f725
parent90aa788957e46603a457d972e100fd547695ead2
parente25bfd9221d17ae8fe0efdc96ed9cd74de0e4a4d
Merge ... '40faf7d48d883c5cd0bb74d8c212de805ef7cdf3'
     and 'f564197dcff7dea800a0dcabf27c4809e2521c8c'