merge of 8691e90bbf4e4ab0587f1abc3e0a4bb9bcdf53df
authorccsmart <ccsmart@smartpal.de>
Thu, 4 Aug 2005 17:26:04 +0000 (17:26 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 4 Aug 2005 17:26:04 +0000 (17:26 +0000)
     and c579a3af7687e512137c2653f94a4b14ce3b4d4f


Trivial merge