merge of 9c6d2f9ed3be4745760b4dcd14811587f4acd623
authorJohn Bowler <jbowler@nslu2-linux.org>
Wed, 18 Jan 2006 07:59:21 +0000 (07:59 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 18 Jan 2006 07:59:21 +0000 (07:59 +0000)
     and b4a513218154eb17b59ed896ac7e0037ab11fc14


Trivial merge