merge of 21066969832f6a294ed9f0024ab410c98d0e1344
authorHolger Freyther <zecke@selfish.org>
Sun, 9 Apr 2006 13:47:43 +0000 (13:47 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 9 Apr 2006 13:47:43 +0000 (13:47 +0000)
commit11b9e61a9c54f5f5a1dcf1025bb42380ca9c2e80
treef82b3bcd2f31c8d1139ea6d45225c19f13ed073b
parent83ff6d4fdc2a0032535d9336b17e9fb93d0c78ba
parent850092283369b93d4c32b1bc96d0199a4089ec2d
merge of 21066969832f6a294ed9f0024ab410c98d0e1344
     and 5b29e14acf993df1ad5460db50d8a5f8fbee8b3c