merge of 'd0a5769f631be6669cccf0f43f7161eb8c9b64a1'
authorKoen Kooi <koen@openembedded.org>
Thu, 26 Oct 2006 16:16:11 +0000 (16:16 +0000)
committerKoen Kooi <koen@openembedded.org>
Thu, 26 Oct 2006 16:16:11 +0000 (16:16 +0000)
commit329118b32306f397cf5a8f39ff9e92544b33395b
treebcf510f3a44d1824f967bcc0cc73e4e457865bb3
parentd3cb1d4281d4fc418ce8897cbda4d2f1686ca524
parentddabd9e011313a30d1c1c8e0ccbbba7702a7fff5
Merge ... 'd0a5769f631be6669cccf0f43f7161eb8c9b64a1'
     and 'f4f9a857ac1b912526c513320ec90f90bea87d37'