merge of '1a297661067ec620e2c9c90e050d5b5f78991383'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Tue, 11 Dec 2007 09:00:04 +0000 (09:00 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Tue, 11 Dec 2007 09:00:04 +0000 (09:00 +0000)
commit79a819b6b9ba15ae6c55ca688d279dab715af0a0
tree8d468974c1c5500ececaa8be0b75014f3e82dea2
parent8483b7301dc68c0e5ffc5c7157b723f5a0a0fdeb
parentc644668e3ff839df99c1a417c62c6444b87e6432
Merge ... '1a297661067ec620e2c9c90e050d5b5f78991383'
     and '5480bec3f64046446cb2d5fdbba10a7a45e5d5f7'