merge of '15b7eadc9952c4f918a8390a157c5b9c400e4394'
authorKoen Kooi <koen@openembedded.org>
Sat, 28 Oct 2006 14:00:49 +0000 (14:00 +0000)
committerKoen Kooi <koen@openembedded.org>
Sat, 28 Oct 2006 14:00:49 +0000 (14:00 +0000)
commit5a5fe7e0d0b6196e8accc54abb29c82daf11615d
tree26558873306cdff4624783600003bfbca2f3ec8d
parent96db35319ed2f97dce4822a5d80fb636f19651ba
parenta84ca6515375010be1cb18ec82ec48968b89bb84
Merge ... '15b7eadc9952c4f918a8390a157c5b9c400e4394'
     and '24a92b152eddaf3edef74b529a0c7f06bd5e060c'