merge of 'b85e20731701ef2d7dc18d059fe5b5cd0e2eb8ac'
authorKoen Kooi <koen@openembedded.org>
Thu, 31 Aug 2006 08:13:59 +0000 (08:13 +0000)
committerKoen Kooi <koen@openembedded.org>
Thu, 31 Aug 2006 08:13:59 +0000 (08:13 +0000)
commitc4185213571da8e53438e2b67da55d89e3a07d36
tree69e4bc5697676dbcceda6db28ea368d411609d70
parent6bfcdbf0b05a8ea5c02321e44b1b567823e191da
parent2b2bb70ca659b9923de0b92d0a9a2cca68ed5d90
Merge ... 'b85e20731701ef2d7dc18d059fe5b5cd0e2eb8ac'
     and 'c43717e39b2264f3f2b9c639768c9aa1c74bc48e'