merge of 2786b01c941e932325ebd3fc61a3a60664dc3b48
authorOyvind Repvik <nail@nslu2-linux.org>
Mon, 3 Oct 2005 22:09:41 +0000 (22:09 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 3 Oct 2005 22:09:41 +0000 (22:09 +0000)
     and 29da97548b6f79e801e68f41b3a37862a7577bfa


Trivial merge