merge of 1b1ecde0d9fd10f2ba39fce06f0fce1cbca7460a
authorDerek Young <dyoung@nslu2-linux.org>
Thu, 1 Sep 2005 21:43:57 +0000 (21:43 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 1 Sep 2005 21:43:57 +0000 (21:43 +0000)
     and 8284202d5f92ed58c17dfd7544c60f96a51659ab


Trivial merge