merge of 0586ecf0426e9c83d8e3dfab53dfc981b06b8070
authorccsmart <ccsmart@smartpal.de>
Sun, 10 Jul 2005 17:21:14 +0000 (17:21 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 10 Jul 2005 17:21:14 +0000 (17:21 +0000)
     and cf55a1f49d730a187fcf973170d6a7e2ce12b2f7


Trivial merge