merge of 853e35738795ae7caa7858e2df6f8cf805e42cc2
authorMichael Lauer <mickey@vanille-media.de>
Wed, 3 May 2006 14:29:36 +0000 (14:29 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 3 May 2006 14:29:36 +0000 (14:29 +0000)
commit914ca8cc9334fde6c2eb0c6e356840f5cc3944f0
treedd1f2be0b0270e4710b2a01928e55660b8e350d3
parentab60b907a46f9d0e55551ae52ad408bb5b278bbf
parent11616e3588c8df8985418a759612fadb30cc0c3c
merge of 853e35738795ae7caa7858e2df6f8cf805e42cc2
     and ddc2ba34a8ed2f37044bdcbbe0d0716407db6565