merge of '6af5be50367621ab5838c9f4dc4e831a81c1d225'
authorKoen Kooi <koen@openembedded.org>
Thu, 9 Nov 2006 13:36:16 +0000 (13:36 +0000)
committerKoen Kooi <koen@openembedded.org>
Thu, 9 Nov 2006 13:36:16 +0000 (13:36 +0000)
     and 'fa302963f7d41e6cdf3efbde3458b3731e8ec5ae'


Trivial merge