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)
     and b1ad57ce7e9bdcbffb51efed051a46a0435d5999


Trivial merge