merge of '3749ce8294a43abc3797bff9e431e3c309e9847c'
authorKoen Kooi <koen@openembedded.org>
Thu, 23 Aug 2007 11:33:00 +0000 (11:33 +0000)
committerKoen Kooi <koen@openembedded.org>
Thu, 23 Aug 2007 11:33:00 +0000 (11:33 +0000)
     and 'fc740829a6a100c7e57ef906efe639744bdc73a1'


Trivial merge