merge of e54d3f9c3cb5f2e740cd272a75c02eb49d140803
authorMichael Lauer <mickey@vanille-media.de>
Sun, 23 Apr 2006 18:55:53 +0000 (18:55 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 23 Apr 2006 18:55:53 +0000 (18:55 +0000)
commit17e1e0b1cf0654047134447e8772e381f6793606
treea03f0658ea620a0099e8bc5296d41427df93a440
parente6581716116e5550228485c192bd950f5e10eee4
parent45050da06d699c8120ee66e0f63219a4f2913317
merge of e54d3f9c3cb5f2e740cd272a75c02eb49d140803
     and edb2b19eb6adbfa6e9319d29bed8c5ca6eedfd06