merge of 80332541fe8af97cf6e4ae0388ba2b0f38b88605
authorOyvind Repvik <nail@nslu2-linux.org>
Mon, 12 Sep 2005 09:37:18 +0000 (09:37 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 12 Sep 2005 09:37:18 +0000 (09:37 +0000)
     and 8886e2ff4b093b9718b9f8291827812566ffd11c


Trivial merge