merge of 6aabdcba32fb2d929d84f69140cc7b14d9af03c3
authorOyvind Repvik <nail@nslu2-linux.org>
Mon, 22 Aug 2005 17:46:51 +0000 (17:46 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 22 Aug 2005 17:46:51 +0000 (17:46 +0000)
     and 738abaf46b3541916e48c08e9c9b267cfa97ca8d


Trivial merge