merge of '16fca46de883fd9f3759f9964bfe144b42a54a2f'
authorKoen Kooi <koen@openembedded.org>
Thu, 23 Aug 2007 10:05:32 +0000 (10:05 +0000)
committerKoen Kooi <koen@openembedded.org>
Thu, 23 Aug 2007 10:05:32 +0000 (10:05 +0000)
     and '28930b93d59bd25dfcdb3c34e3c8d421704100f2'


Trivial merge