merge of 32a8152d0bee4b649384f3a9e102a4676de42023
authorccsmart <ccsmart@smartpal.de>
Mon, 1 Aug 2005 09:05:42 +0000 (09:05 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 1 Aug 2005 09:05:42 +0000 (09:05 +0000)
     and b1c87d8b200c1c4fd98633961388fdd092b8e00a


Trivial merge