merge of 35cc385288e7302b688800adaae976f0815b05eb
authorMichael Lauer <mickey@vanille-media.de>
Wed, 26 Apr 2006 21:40:25 +0000 (21:40 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 26 Apr 2006 21:40:25 +0000 (21:40 +0000)
commitd4e30ce209a03dada78d51d4f1522fcc4bd7ea8b
tree0537c2970557fd5dbbdb85d81ff5803cbe540666
parentfefd270da781d5d8ac82be5b80c3051e1e9155db
parent05bf77171a9a72ed485cb4b8590f8246a9762817
merge of 35cc385288e7302b688800adaae976f0815b05eb
     and 9e19112a1220e2f1c7cb44d9f8f9f71c7b3cae88