merge of d6fdb02a91d1c19b5e0e6c9c0e484f3e14b2ca77
authorOyvind Repvik <nail@nslu2-linux.org>
Mon, 4 Jul 2005 14:39:40 +0000 (14:39 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 4 Jul 2005 14:39:40 +0000 (14:39 +0000)
     and fc7a16d864477c5d989f50430896d4cf6df31265


Trivial merge