merge of '22707d4a2732d846be50633b33777233881d2761'
authorKoen Kooi <koen@openembedded.org>
Mon, 12 Mar 2007 20:24:12 +0000 (20:24 +0000)
committerKoen Kooi <koen@openembedded.org>
Mon, 12 Mar 2007 20:24:12 +0000 (20:24 +0000)
     and 'cc36c0fcd3ef4d293e42c2d04104ccaeb774fc1f'


Trivial merge