merge of '1cd257c57e952cce419bacf94a4f03a148fcd17d'
authorKoen Kooi <koen@openembedded.org>
Thu, 10 Aug 2006 15:50:42 +0000 (15:50 +0000)
committerKoen Kooi <koen@openembedded.org>
Thu, 10 Aug 2006 15:50:42 +0000 (15:50 +0000)
     and '6be389aa528c943664977e1ac710bfd80cfd5a36'


Trivial merge