merge of '89852768a5c62b0d92f57ecb8aa98eecfba1c740'
authorKoen Kooi <koen@openembedded.org>
Tue, 15 May 2007 12:55:30 +0000 (12:55 +0000)
committerKoen Kooi <koen@openembedded.org>
Tue, 15 May 2007 12:55:30 +0000 (12:55 +0000)
commitffc3b085d02fd07bbb0e24a71fa4b4d442b999a4
tree97747789099a3be3cf608b3b05872cfbe0e7dfb1
parent3eef0ac777ef9fe0983e40d70135c57183988ecc
parent002caab239157d1062a3f49b62efb06ef0489280
Merge ... '89852768a5c62b0d92f57ecb8aa98eecfba1c740'
     and 'd03e5ca1084f5be98ee7abe28783d5017ed90397'