merge of 4dadf63bbebda1f933b9233fd040beaafb872686
authorKoen Kooi <koen@openembedded.org>
Thu, 28 Jul 2005 09:44:39 +0000 (09:44 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 28 Jul 2005 09:44:39 +0000 (09:44 +0000)
     and 76308a620ffc85d4fdadc1b76147a880bb879e0e


Trivial merge