merge of '178ad077ac028be1b22bf39a8144558596dbb686'
authorKoen Kooi <koen@openembedded.org>
Thu, 14 Sep 2006 11:18:52 +0000 (11:18 +0000)
committerKoen Kooi <koen@openembedded.org>
Thu, 14 Sep 2006 11:18:52 +0000 (11:18 +0000)
commit54ef07897ac9cadb8d291dc05e4494ba68695411
tree01b250ce92656a2b52dd080be9a36fae9a57d459
parent9922027b3582365d4c6540faa51b08b4a762d88e
parentae0539c18ae8fc1b69affea460f66682cf7ffe62
Merge ... '178ad077ac028be1b22bf39a8144558596dbb686'
     and 'f7550674270fdfc2af92801ae59716d552b9120b'