merge of '300063bb2f3d1abb7a7532b48c45894ec6098d31'
authorKoen Kooi <koen@openembedded.org>
Tue, 26 Sep 2006 13:47:00 +0000 (13:47 +0000)
committerKoen Kooi <koen@openembedded.org>
Tue, 26 Sep 2006 13:47:00 +0000 (13:47 +0000)
commit97b2a9ed72620b72f6325ad305db03e72b9d399d
tree583b73e4335b128ec929a065c9a62710d4433146
parent9f05350074121aeb9ce283ebecf8d91e9ff2546e
parentfbef170546c9d0c31ea1a9977666fe34617cd4e8
Merge ... '300063bb2f3d1abb7a7532b48c45894ec6098d31'
     and '60a1e8380dd7fc43fb994db1a4b4071e1a95b60b'