merge of 31d634290b40d4d8cc5d473e180317f3a7ffbe71
authorOyvind Repvik <nail@nslu2-linux.org>
Fri, 8 Jul 2005 04:45:11 +0000 (04:45 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 8 Jul 2005 04:45:11 +0000 (04:45 +0000)
     and 45e454c99aff34d6ae66bd0a87997bf9543dd882


Trivial merge