merge of 265d2e9e9ce106124a5fafc0bd7dc28c8374fc08
authorccsmart <ccsmart@smartpal.de>
Wed, 3 Aug 2005 20:28:51 +0000 (20:28 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 3 Aug 2005 20:28:51 +0000 (20:28 +0000)
     and d408ff3410c159570bd76e7534e21ad0b31852eb


Trivial merge