merge of '4e163b633216723377aa90e615e80915ff1c78df'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Tue, 12 Sep 2006 17:02:44 +0000 (17:02 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Tue, 12 Sep 2006 17:02:44 +0000 (17:02 +0000)
commit09df48d2808e2e261cf17f2224c9cf8510dbbe77
treec4e165516899b45e444a79ee20fad5e8095664ab
parent03051884eea4af47b099f3b1e09325a064d70cd1
parentfeaff8459f0297a60feb0d7ef30840b408dff7f5
Merge ... '4e163b633216723377aa90e615e80915ff1c78df'
     and 'd54f42654eeb09635541659baf2e2803b3b1de4e'