merge of '2af10c8f8ecac83cfb23286aebb3172d45a4a12f'
authorKoen Kooi <koen@openembedded.org>
Fri, 13 Oct 2006 13:02:53 +0000 (13:02 +0000)
committerKoen Kooi <koen@openembedded.org>
Fri, 13 Oct 2006 13:02:53 +0000 (13:02 +0000)
commit5dee75a79132a577fd665f82ac453f0b4edfb9a4
tree25bf9c3c29ec8bcc844050ed34c29d8b093820e4
parent4fa2c89ec61664ea9842db12b1df01d879640ac1
parent88ef57373e921bf59253f8fb2939763b3036444a
Merge ... '2af10c8f8ecac83cfb23286aebb3172d45a4a12f'
     and '51b5481655e96906c986a4ff927a78ce129f0109'