merge of 01c1850873f10c350058c1f27c3c2f03fc450a29
authorMarcin Juszkiewicz <hrw@openembedded.org>
Sat, 20 May 2006 12:08:21 +0000 (12:08 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 20 May 2006 12:08:21 +0000 (12:08 +0000)
commit775ad19d1e712b2cdff21226820f8535964a9f70
tree572d8407f96294b9e6af5c1724b6fa96dc60f5ac
parent2a46e18cceae6f0ead7d2d470bc78fb0f6478b0a
parent3360528ed1615dff05dddca99d26fc67fa54e77b
merge of 01c1850873f10c350058c1f27c3c2f03fc450a29
     and aca2e92b4aa01fa7f5bb94eede89c3e395a5c5e9