merge of 6da21d0d95b412989c3883c587af4931afea6741
authorKoen Kooi <koen@openembedded.org>
Thu, 21 Jul 2005 21:38:28 +0000 (21:38 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 21 Jul 2005 21:38:28 +0000 (21:38 +0000)
     and d23fa20efa477539bb55a99c02a96896167f1c2b


Trivial merge