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)
commit2db17c741de71cc34e26130d1e23391f06beaaa1
tree7c212712651aef6c90d1680f9d961e3e398b2309
parent0671fc09447f5fc246198cacd44c30f74e3fec89
parent43cd3c0c6b338107c3540233600f2a0bf16854e1
merge of 9c6d2f9ed3be4745760b4dcd14811587f4acd623
     and b4a513218154eb17b59ed896ac7e0037ab11fc14