merge of '59af9461600816295b2ae93e9b4152253f8fade0'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Sun, 29 Oct 2006 13:45:28 +0000 (13:45 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Sun, 29 Oct 2006 13:45:28 +0000 (13:45 +0000)
commitc4301a4f782a2260ba2d7209f6e99d13f2d7676d
tree925363456a4f49c8557182984d37f760da1eac0a
parent7eefe1a09db7dab17fe4db1adc6f2cc27bf8175f
parentd9bc27d912b4e828bf5371f2bb9ce36917779395
Merge ... '59af9461600816295b2ae93e9b4152253f8fade0'
     and '72528d9d61c429d9781db3e1ec1c4e90f086cf1b'