merge of 479eca038e6fb0b43a93c7dd3ab6d82a6c8bd9b0
authorOyvind Repvik <nail@nslu2-linux.org>
Thu, 14 Jul 2005 12:15:37 +0000 (12:15 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 14 Jul 2005 12:15:37 +0000 (12:15 +0000)
     and ed9017c6685eaffb061f6dc1775021dcf7c6f96d


Trivial merge