merge of 05bc37d3f00068d129ee791a91fcb0a203d7f7d3
authorccsmart <ccsmart@smartpal.de>
Sat, 9 Jul 2005 16:20:57 +0000 (16:20 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 9 Jul 2005 16:20:57 +0000 (16:20 +0000)
     and 53c35384d4c6d494c0d740195d391ef05aed1fb7


Trivial merge