merge of '1d466223051b440fb06aab1ad59b32e9d6327361'
authorKoen Kooi <koen@openembedded.org>
Sun, 12 Aug 2007 10:04:39 +0000 (10:04 +0000)
committerKoen Kooi <koen@openembedded.org>
Sun, 12 Aug 2007 10:04:39 +0000 (10:04 +0000)
commit91ba719f69aa81e8084ac4602268b1d10b55b7dc
tree7ca007fe502648414c30d8b8048800643a7587c3
parent68ce2211b09ef61659cf2ee7665d545e087335a3
parent36f9208ab9b44b30edd8b9981f21a376091aaffc
Merge ... '1d466223051b440fb06aab1ad59b32e9d6327361'
     and 'fd98012fea1d4da46fcc95cf50ac457d7c7f1023'