merge of 2b5fa295a117990b2c79f21b2bcd9f9d730cca15
authorKoen Kooi <koen@openembedded.org>
Tue, 15 Nov 2005 11:12:23 +0000 (11:12 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 15 Nov 2005 11:12:23 +0000 (11:12 +0000)
commitee76c67e588ec0b86ec4f4b729bf7ca5a3728ab1
tree43d1f665e13c06b3d8ca725e93bb800d4ed3f7fc
parent4517a7f078a24c3af19cf5e43098882ba3028171
parent4a296ef340151a9a04059aa9d95a8ee694f3c064
merge of 2b5fa295a117990b2c79f21b2bcd9f9d730cca15
     and aa6fecda5cd87c53e3b490bfd65e9c792598aa46