merge of 23a6ba326b8bc5b4996899473c171710e6bb6685
authorKoen Kooi <koen@openembedded.org>
Fri, 26 Aug 2005 14:23:15 +0000 (14:23 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 26 Aug 2005 14:23:15 +0000 (14:23 +0000)
     and 41853f4a903b2c4a4541c45b19966ab1c9e72a08


Trivial merge