merge of 6fb4978a07ca11f96878426dfaf26f3aab7778c8
authorccsmart <ccsmart@smartpal.de>
Wed, 3 Aug 2005 17:47:27 +0000 (17:47 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 3 Aug 2005 17:47:27 +0000 (17:47 +0000)
     and e464450f2362ae2c974ed0a3bbc9625a5d27bcba


Trivial merge