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)
     and 'f7550674270fdfc2af92801ae59716d552b9120b'


Trivial merge