merge of '1d9afcd1f3d90ea7abf5cfc1915392bf9edb076d'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 27 Aug 2007 11:28:05 +0000 (11:28 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 27 Aug 2007 11:28:05 +0000 (11:28 +0000)
commit118ac1ca0c4ebb0a7dc143527a6dd5e7cfdcc109
treea6f9ad24c9575aabca615217d9e99f0beca1bef5
parentfe4baf03f970079c5000faa59a352b420c937849
parent130f1bbdd305d32b4fee26fff1656b198d62cdd9
Merge ... '1d9afcd1f3d90ea7abf5cfc1915392bf9edb076d'
     and '26b8940ca9869ff7c4b384c11ddddffb98dc101d'