merge of '62059cae4cb0ae75e3be74df3c9f3a84152b2c00'
authorKoen Kooi <koen@openembedded.org>
Thu, 9 Aug 2007 19:27:17 +0000 (19:27 +0000)
committerKoen Kooi <koen@openembedded.org>
Thu, 9 Aug 2007 19:27:17 +0000 (19:27 +0000)
     and 'd6a10d625959447cfd5ddb1d23ccd908be4f2ca7'


Trivial merge