merge of 8ae00e8423679ec41790b01db397b47b07473927
authorJohn Bowler <jbowler@nslu2-linux.org>
Sat, 21 Jan 2006 00:22:57 +0000 (00:22 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 21 Jan 2006 00:22:57 +0000 (00:22 +0000)
     and 90cfec2b058d549c4919f09e6d58e09c7dabca84


Trivial merge