merge of 87173fb74721cf392e0e3b101c9f04c6b8e7f02d
authorKoen Kooi <koen@openembedded.org>
Mon, 3 Oct 2005 18:46:08 +0000 (18:46 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 3 Oct 2005 18:46:08 +0000 (18:46 +0000)
     and c3faa03a1a4d2231cb4f0f7fa31dac6d4b183100


Trivial merge