merge of 079915a55f24902d8284c03a7b3adbdacae9275a
authorKoen Kooi <koen@openembedded.org>
Thu, 28 Jul 2005 14:18:21 +0000 (14:18 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 28 Jul 2005 14:18:21 +0000 (14:18 +0000)
     and e91215dbe7d81225280dbae31ec4d29630f67f58


Trivial merge