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)
     and 9e19112a1220e2f1c7cb44d9f8f9f71c7b3cae88


Trivial merge