merge of 28b5204f533562d4df4b43cde7bbc16981fb0d0a
authorMichael Lauer <mickey@vanille-media.de>
Sun, 2 Jul 2006 13:55:14 +0000 (13:55 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 2 Jul 2006 13:55:14 +0000 (13:55 +0000)
commit65439f896f4d5ec54adfd99e94fc9f456d4f0c2d
treec7fa43d27f6c789583979dd0665937587507674a
parentc4ad3b40f4e5eb92adf68db603c9eebc50bc367b
parent976e85862386b35882ac202796be3ffec2247737
merge of 28b5204f533562d4df4b43cde7bbc16981fb0d0a
     and 2bb3d19276030cbe60359b8392b763021c776513