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)
commit022cad9938488cdc84511658fb112b73b7605c82
tree46517af689f6b1493997dedd7294a3102211302a
parent2db17c741de71cc34e26130d1e23391f06beaaa1
parentc8508a346bd0d33126fef88406bab42320514abd
merge of f32b2805c6ecb514661bd053c664684ab5f7323f
     and b78c38c1ca7715097407f79c1f432372e7b8c258