merge of 0e0901aeb2df666b7ef411c84571c64d8648f2f7
authorMichael Lauer <mickey@vanille-media.de>
Sat, 9 Jul 2005 12:25:15 +0000 (12:25 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 9 Jul 2005 12:25:15 +0000 (12:25 +0000)
commit569a89e69a417e2d8efe690b41a3968dbc690f02
treed47ee6495b4dcd55b3e0a343e289dac5be6f401d
parente699f52a5a752f2198b404171288d8dcb2d0bef1
parent9310b1b3d0ee0c7d49e7cb0e6a55b2d3c8c42454
merge of 0e0901aeb2df666b7ef411c84571c64d8648f2f7
     and 37b3bd1d7cf4c3ff2c0e00c6bd7a87d690fc63d5