merge of a0bb6704d46edd06e3acb50139d67212a028aa50
authorKoen Kooi <koen@openembedded.org>
Thu, 29 Jun 2006 18:19:14 +0000 (18:19 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 29 Jun 2006 18:19:14 +0000 (18:19 +0000)
     and ec186ae975c7b81c6668e0e2e7ba362a9801af90


Trivial merge