merge of 'ac74fcc2453aa7482b87f6c60813db2ff346f849'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 24 Aug 2007 09:42:19 +0000 (09:42 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 24 Aug 2007 09:42:19 +0000 (09:42 +0000)
commit2f55c1fa002edd9513dcba58a9061cb73cc9bfd4
treece9ce0ddeb88c0b8e225970fc44eeefd49f8fc12
parent83f12827ab0d53ea3f5f38d4f97df838f1a2a8a2
parent2a22dad1333c5e71feb6e9c7c4f4fb7dd1d8a447
Merge ... 'ac74fcc2453aa7482b87f6c60813db2ff346f849'
     and 'd856396130f5cff8cb6cb3913650cd3132574135'