merge of '29c0c6efff11ca4f1cf8681ef59b975dc70b0738'
authorKoen Kooi <koen@openembedded.org>
Tue, 14 Aug 2007 09:42:39 +0000 (09:42 +0000)
committerKoen Kooi <koen@openembedded.org>
Tue, 14 Aug 2007 09:42:39 +0000 (09:42 +0000)
     and '5da1612b322f56f442443b8546bbe8e7a75289f3'


Trivial merge