merge of 2510e5252ac32a4848eb302514a1d35602ed7afd
authorJohn Bowler <jbowler@nslu2-linux.org>
Mon, 6 Feb 2006 01:31:29 +0000 (01:31 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 6 Feb 2006 01:31:29 +0000 (01:31 +0000)
     and 65b0cd64eeef02b789460148d6bb958749417f11


Trivial merge