merge of 541dc5976410d780e5918ffaf19fc9e2e17e40cc
authorJohn Bowler <jbowler@nslu2-linux.org>
Fri, 1 Jul 2005 02:10:24 +0000 (02:10 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 1 Jul 2005 02:10:24 +0000 (02:10 +0000)
     and de56403f43f1ceeaffcfca380aff23d0c1426036


Trivial merge