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


Trivial merge