merge of '604e4566ff77ba4e877e134951341dca1fbf145e'
authorKoen Kooi <koen@openembedded.org>
Mon, 4 Aug 2008 16:43:33 +0000 (16:43 +0000)
committerKoen Kooi <koen@openembedded.org>
Mon, 4 Aug 2008 16:43:33 +0000 (16:43 +0000)
commit814bc470c250b650dbb145d44cc21a1511bad39f
treed58893dce6b7dbf02b2c0b648b79ba710cd1e9e8
parent29f6b384ef2899fda7d18b990622a9b30a7aa8d2
parent4216de7b49215f46cfb0071753b2a371a0380416
Merge ... '604e4566ff77ba4e877e134951341dca1fbf145e'
     and 'f2ceedc03b70c983dbbb20c9f461a7f40d0941e7'