merge of '1293c35f9186cb98ae4e1efe9e3cb8cc0e607def'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Tue, 3 Jul 2007 17:01:04 +0000 (17:01 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Tue, 3 Jul 2007 17:01:04 +0000 (17:01 +0000)
commit25550bf2091bb90cbde005e19b8e0dd049d239c8
tree52b3f2a412a0743900ecd2d57e92274e8fb0d954
parent985b1d1346fca88c8dec191a50756c4d8d421145
parentba79a30b16983d3b1ba48c5930c208861b979e82
Merge ... '1293c35f9186cb98ae4e1efe9e3cb8cc0e607def'
     and '799ba111ed9bf4dd2c65638fc75b6af788b54ab7'