merge of 56c4ad3f8bd89081f85f57b468371c5550c5ac02
authorJohn Bowler <jbowler@nslu2-linux.org>
Tue, 1 Nov 2005 15:26:40 +0000 (15:26 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 1 Nov 2005 15:26:40 +0000 (15:26 +0000)
commit8b8b59d12e2970dfb10ee939c06283a553d24571
treee00e4010b9bba24f800d3813df9299d963b6dec2
parent709574db0efb50ea9e001129dd73f02155f8617c
parent1830ce7071bbdc183a29aa9e0febea3b9fc04876
merge of 56c4ad3f8bd89081f85f57b468371c5550c5ac02
     and ea663319603d7cd9a809a14f32a31e0f4dfc5f0c