merge of 08db957fdc2ccf76cc3653ef7749381a03947741
authorkolla <kolla@uninett.no>
Tue, 2 Aug 2005 00:02:04 +0000 (00:02 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 2 Aug 2005 00:02:04 +0000 (00:02 +0000)
commit333f109e030f35abc06a059c567facee8703c537
tree883f1a107535966d9a355e6d674b89e44a14f304
parenta1a70d53f72fbafaf9fec8069f347365d9e7cecb
parentfb6dd19b9777a34ef6a3fee954d80a5485b12ef1
merge of 08db957fdc2ccf76cc3653ef7749381a03947741
     and b1ad57ce7e9bdcbffb51efed051a46a0435d5999