merge of 53837b57b14a20c51df704090e14559b1bb45c2e
authorJohn Bowler <jbowler@nslu2-linux.org>
Tue, 7 Feb 2006 02:45:14 +0000 (02:45 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 7 Feb 2006 02:45:14 +0000 (02:45 +0000)
     and db44099923569a202d14953cbddea82c0547ccb1


Trivial merge