merge of 815a46e9006a8a3b26fc0264d17258543b20de44
authorccsmart <ccsmart@smartpal.de>
Wed, 3 Aug 2005 18:07:10 +0000 (18:07 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 3 Aug 2005 18:07:10 +0000 (18:07 +0000)
     and 9004652e60567f772781f6d7f3257b2e8cf79416


Trivial merge