merge of 209b7382475a49469249357ffce8d8c60b90e409
authorccsmart <ccsmart@smartpal.de>
Mon, 1 Aug 2005 08:59:22 +0000 (08:59 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 1 Aug 2005 08:59:22 +0000 (08:59 +0000)
     and 8f3f305ea25b1e9639f789becd55350412662b48


Trivial merge