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)
commita9ce299f26d511edac955fca9f55fd19a20ced4a
tree4104e4702b6ad1961b72f3673919a4759782165c
parentd2b8df1751fed07eb5f57522705723d21c92a71f
parentf58099c4b71893db89309bb714f01b1482f10667
merge of 4dadf63bbebda1f933b9233fd040beaafb872686
     and 76308a620ffc85d4fdadc1b76147a880bb879e0e