merge of 445191ac8aa50c61b1a86a6ed50f98515cfe4502
authorKoen Kooi <koen@openembedded.org>
Fri, 2 Sep 2005 13:25:22 +0000 (13:25 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 2 Sep 2005 13:25:22 +0000 (13:25 +0000)
     and 8ea4e34f565a6ef515ff201e69997d656976d488


Trivial merge