merge of 627144113ec3248e0a1cd33b66352d01bde87866
authorOyvind Repvik <nail@nslu2-linux.org>
Sat, 20 Aug 2005 15:00:43 +0000 (15:00 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 20 Aug 2005 15:00:43 +0000 (15:00 +0000)
     and e951982319017716291e547c31cf1a75b2ccd676


Trivial merge