merge of 911d39563f4bbb32b27acb504168de96ff1e68f7
authorOyvind Repvik <nail@nslu2-linux.org>
Sun, 5 Feb 2006 05:26:43 +0000 (05:26 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 5 Feb 2006 05:26:43 +0000 (05:26 +0000)
     and c6e9501260c1bb7c2842f36ce47f70045a964179


Trivial merge