merge of 6f9c7403f1e4f0d922265c7dd8615d5adc725a91
authorOyvind Repvik <nail@nslu2-linux.org>
Wed, 10 Aug 2005 02:52:58 +0000 (02:52 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 10 Aug 2005 02:52:58 +0000 (02:52 +0000)
     and fcfbb6c34ad994d45f290872875c8717b5409ecf


Trivial merge