merge of '12e8362ccf0740454595721a242cfb8e867eb512'
authorKoen Kooi <koen@openembedded.org>
Sun, 3 Aug 2008 08:02:24 +0000 (08:02 +0000)
committerKoen Kooi <koen@openembedded.org>
Sun, 3 Aug 2008 08:02:24 +0000 (08:02 +0000)
     and 'e7f394edea22558fdbcb02929f1540784a5265f2'


Trivial merge