merge of 470f2685dfe5cb3786786067c1edf1282dd1c536
authorMichael Lauer <mickey@vanille-media.de>
Sat, 23 Jul 2005 20:00:48 +0000 (20:00 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 23 Jul 2005 20:00:48 +0000 (20:00 +0000)
commitfc0159d05f362b458f2d995b522e5cccde4952f1
tree97e2e17634f44357e8b8ab7e65d21463e6003e11
parent9ad6142885c827a87dae653cf44fc8b8af54188d
parent9925e0ce6b7b6c5fa62ce1fed6b1198bb10c1c88
merge of 470f2685dfe5cb3786786067c1edf1282dd1c536
     and 50481fac31a3c89de7959f87001b670c05ea5e7a