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)
commit925e5796e12d9a70da5fbaddc6fddfa1cd644f56
treedfb7ba53d683911d1fd079f22f6a36290b9b69c4
parenta4387c8e6f727bdee91f8062be68053bc7b5d3c4
parent3b23228ed78c8b4c2b7d376eb020a0e8980249b2
Merge ... '22707d4a2732d846be50633b33777233881d2761'
     and 'cc36c0fcd3ef4d293e42c2d04104ccaeb774fc1f'