merge of 5888828b989dd614ebe23f86073064bc3b0fc9d3
authorKoen Kooi <koen@openembedded.org>
Thu, 28 Jul 2005 14:19:42 +0000 (14:19 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 28 Jul 2005 14:19:42 +0000 (14:19 +0000)
     and 5a333cd4bee97ad57667f94f2f17a96800af8232


Trivial merge