merge of 868246069be482bc64e4d7bd013d7a0df35de286
authorMichael Lauer <mickey@vanille-media.de>
Thu, 11 May 2006 16:20:30 +0000 (16:20 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 11 May 2006 16:20:30 +0000 (16:20 +0000)
commita929c95a66b89e9a510fe41658144f9b6738dd6a
treef568507430cc61019bc7df19999c1c3e508714d1
parent287fc0b071b62f477e83f13ad07af7bce610bd2d
parent844bf825c75c21864c1ba911642d58021e08e9ed
merge of 868246069be482bc64e4d7bd013d7a0df35de286
     and e4d2a954ceceaa23fece37507c8e7f43cfbf1047