merge of 1671361e7579e71d868be23893006f827fbff717
authorJohn Bowler <jbowler@nslu2-linux.org>
Wed, 2 Nov 2005 04:09:46 +0000 (04:09 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 2 Nov 2005 04:09:46 +0000 (04:09 +0000)
     and 57d918c4d3b1b0b352541f3d7274331f8e9002bd


Trivial merge