merge of 35ce256593987e71d7c04247837a04f2dfaea425
authorMichael Lauer <mickey@vanille-media.de>
Mon, 1 May 2006 12:07:55 +0000 (12:07 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 1 May 2006 12:07:55 +0000 (12:07 +0000)
commit6c6c1843d871ad454797fee6814360018e772a24
tree23d7acd51ab2b17e1193ac136d9c6aba06f54863
parent9c4951eb174ea42368077d008d78c01222bbed37
parent07f6a2d51842fe58c245bb167e5e0c020e6583a7
merge of 35ce256593987e71d7c04247837a04f2dfaea425
     and c973ff55ff1f4aa31763966c5b65965b1da3e903