merge of 3c51b3a56df4d11fa759fd5ddbaf3fd02c7ac250
authorMichael Lauer <mickey@vanille-media.de>
Sat, 10 Jun 2006 11:20:56 +0000 (11:20 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 10 Jun 2006 11:20:56 +0000 (11:20 +0000)
commite2e769cf5aaf5d0cd39cfd563d694af446588a30
tree396ff4932a5520cba787d5b29d36a6a9251b047a
parent77da90f344c9f4d55eb5cac92c8d3a7e77f6884c
parent14ddbd9a7ebc0ae29b6bf9ec1b65626f607a5ff8
merge of 3c51b3a56df4d11fa759fd5ddbaf3fd02c7ac250
     and a11a9b2115534b69d4caed3521f23c8da3c2c11f