merge of 694e3e889df61d4f0755b908f187cc494887e701
authorKoen Kooi <koen@openembedded.org>
Sat, 23 Jul 2005 19:32:26 +0000 (19:32 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 23 Jul 2005 19:32:26 +0000 (19:32 +0000)
     and 8b4259611fcc8bb40ab81877e66247b9f42bdb38


Trivial merge