merge of 73a040e1292f94333eab9d73425b9fdecf4da694
authorMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 31 May 2006 12:48:28 +0000 (12:48 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 31 May 2006 12:48:28 +0000 (12:48 +0000)
commit8956cf5769f9a3169f22b4fda1da2a57abbc9749
treefb80aaa57e52f61c54cf6d4a3c4b6dfd85196385
parent3795536e3e9601b10e04935d3f150580b2a94d70
parent3e3f65c1fc4fec5e1ed93b18875b481de4c995e1
merge of 73a040e1292f94333eab9d73425b9fdecf4da694
     and f33cef327c300a5f666b9a3f79571edc4225cfe0