merge of 85ab954bb82c2414794b5e63feca7970416e1156
authorMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 28 Jul 2005 14:19:36 +0000 (14:19 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 28 Jul 2005 14:19:36 +0000 (14:19 +0000)
commit9dc40f2bbd08be51411e4dc31ca504d95e97818b
treeb0ad6acd7f1242325f13b811daf760a8f615ec65
parentcf79e746ba1a0f5850c31914e6c94a10a9f977ac
parentf3a58bb241a3259d9bd0131f96435c85c40686d0
merge of 85ab954bb82c2414794b5e63feca7970416e1156
     and e91215dbe7d81225280dbae31ec4d29630f67f58