merge of 1ba5e5da6f959068ba57d3ec6046c21ca621cd8c
authorKoen Kooi <koen@openembedded.org>
Mon, 5 Sep 2005 18:22:38 +0000 (18:22 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 5 Sep 2005 18:22:38 +0000 (18:22 +0000)
     and 21490fb90785cccbb3926c5fc9a7adf67d89e0b0


Trivial merge