merge of 'a215524bc68709c948773354aab3283121aed094'
authorKoen Kooi <koen@openembedded.org>
Mon, 7 Aug 2006 18:44:53 +0000 (18:44 +0000)
committerKoen Kooi <koen@openembedded.org>
Mon, 7 Aug 2006 18:44:53 +0000 (18:44 +0000)
     and 'bae05c897881f1de9bc358bed7a16439c27e7e5d'


Trivial merge