merge of 90381a674a1aead7590d9fe88885d9a57dea4e9e
authorJohn Bowler <jbowler@nslu2-linux.org>
Fri, 5 Aug 2005 23:30:40 +0000 (23:30 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 5 Aug 2005 23:30:40 +0000 (23:30 +0000)
     and d9996b78a73b41596bd40c745a5fb7f24bcd8695


Trivial merge