merge of '5c6bd9229c2912167e04e747499aa015e936f86e'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 23 Aug 2006 11:15:20 +0000 (11:15 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 23 Aug 2006 11:15:20 +0000 (11:15 +0000)
commitd67a8ee9a19dc01ad9ac3a3cc3dd756d31a42696
tree81275bb86db73f5b7abc576158e2787739e5b2bd
parent013fe9f4f1391a683ac4db41ee1b5ea248ec46e9
parent79979777735949ffe672199e8e8288a404c4c8dc
Merge ... '5c6bd9229c2912167e04e747499aa015e936f86e'
     and '99d4c960758f8db7a224500ef5d1acd1663ceec0'