merge of 1b601f0ec6ab29681a14be2f437f3ea7d01e877b
authorJohn Bowler <jbowler@nslu2-linux.org>
Tue, 10 Jan 2006 09:38:55 +0000 (09:38 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 10 Jan 2006 09:38:55 +0000 (09:38 +0000)
     and fe9ab59624a3c03737b56db99eaa945b890ddc8a


Trivial merge