merge of 80f6af3e8d9657bdfa59fa62d84fe03c09d93944
authorMichael Lauer <mickey@vanille-media.de>
Sun, 19 Mar 2006 01:37:05 +0000 (01:37 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 19 Mar 2006 01:37:05 +0000 (01:37 +0000)
commit89d5937f9deb21493e356da573c432c2faab7371
tree91dba40e1ed978748c8cabb57d7fa8e3e38f3236
parent941bff95c3b80ea01c7fa0fdc8062ea04260b6fe
parentdacf6b8afe4dfec74a08e9dbcccb65c02fa0bfb7
merge of 80f6af3e8d9657bdfa59fa62d84fe03c09d93944
     and ba687e58e5920f60f96f8753b6d3e6dba22c0dad