merge of '166a496479db8302a15b8d67da979a4d5831f049'
authorKoen Kooi <koen@openembedded.org>
Wed, 30 May 2007 09:52:21 +0000 (09:52 +0000)
committerKoen Kooi <koen@openembedded.org>
Wed, 30 May 2007 09:52:21 +0000 (09:52 +0000)
commit157fbe3c50f634c3c06003ea86b9493a19f665c6
tree78a017bc5bd448ab0d340964898ceabe890c88c8
parent1a241c914a27ede849021c4c4cb5f408a22cab53
parentf9ef49020cb889e0abba839eb8fab9bed657dca8
Merge ... '166a496479db8302a15b8d67da979a4d5831f049'
     and '6eac237f0d909ba98b365d88b337ff3e822907e1'