merge of 297319220bbe0dfbc43d63ae1a0cdfed469df8aa
authorOyvind Repvik <nail@nslu2-linux.org>
Thu, 25 Aug 2005 15:02:33 +0000 (15:02 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 25 Aug 2005 15:02:33 +0000 (15:02 +0000)
     and dca4f1b7a000914caf1cdea0ed1b3898acf3e120


Trivial merge