merge of 34a4cccc8cdb74f4173031879341a1dcedfc7e31
authorKoen Kooi <koen@openembedded.org>
Thu, 11 May 2006 08:25:03 +0000 (08:25 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 11 May 2006 08:25:03 +0000 (08:25 +0000)
     and a9e4bb6b87ea6a9da3a9830289da0aeddb70f467


Trivial merge