merge of 44ef2a80f1407b2958e8f750892482362d9bb352
authorKoen Kooi <koen@openembedded.org>
Mon, 28 Nov 2005 21:04:52 +0000 (21:04 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 28 Nov 2005 21:04:52 +0000 (21:04 +0000)
     and 4fb1223f75836093b262b92d3533307a1300b174


Trivial merge