merge of '4c8bd7ca61d815d94202feba1abab9c776a93350'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 26 Apr 2007 11:01:15 +0000 (11:01 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 26 Apr 2007 11:01:15 +0000 (11:01 +0000)
commite83c087db9e90da91b3b7c9d4fc14915f4c36ee9
treec1dc1080b5ad7f7591fc090651cd25c7a72ed83a
parent089b5378d7a49b5a798ea6d35d8145b65ded4305
parentb848b0730c8dedef5d9607d7222761685ebc5598
Merge ... '4c8bd7ca61d815d94202feba1abab9c776a93350'
     and 'fc756d25fc999f6ac7951c0122c5beaa2f754e3c'