merge of 0a4dda033896ff5bcc2aac99f0ac7064e34f6cd6
authorJohn Bowler <jbowler@nslu2-linux.org>
Fri, 3 Feb 2006 02:29:23 +0000 (02:29 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 3 Feb 2006 02:29:23 +0000 (02:29 +0000)
     and 5ffc1b1540c0c7e039758bae429eea419195f09b


Trivial merge