merge of '2a763ba11cf69b342a356812987f63bb2053011b'
authorKoen Kooi <koen@openembedded.org>
Mon, 3 Dec 2007 12:15:18 +0000 (12:15 +0000)
committerKoen Kooi <koen@openembedded.org>
Mon, 3 Dec 2007 12:15:18 +0000 (12:15 +0000)
commit0d9e9a839d6a35ef75cb10224302c860f0ef4309
tree4233de81c852c82dda6e8904fefedf17cf12211b
parent4c12de840646dd2ff12ddcba9663717e9387a28f
parent9d2b1056a5121ac78c64f51fbdc34f31ca6b092a
Merge ... '2a763ba11cf69b342a356812987f63bb2053011b'
     and '4ca56810304293da744170c82e50552f5dcf084f'