merge of 2ab40f2da7b39983c44422e04888f7b91471b2d7
authorKoen Kooi <koen@openembedded.org>
Sun, 24 Jul 2005 18:17:28 +0000 (18:17 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 24 Jul 2005 18:17:28 +0000 (18:17 +0000)
     and dd4ebed2bb572edf6af4257b824e42f38c9e3de9


Trivial merge