merge of 7f1a36bb348422ee0ee7643b6c8090a43f6900f4
authorMichael Lauer <mickey@vanille-media.de>
Wed, 27 Jul 2005 23:18:57 +0000 (23:18 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 27 Jul 2005 23:18:57 +0000 (23:18 +0000)
commitd2b8df1751fed07eb5f57522705723d21c92a71f
tree150ba1457cae678cae9a2106d19d3f8200e35e75
parent7f4531c6654d89c928c64c057207149c3d4d9fe6
parent503f111db3dc9ca1c212f44770946d9f53ebd6c0
merge of 7f1a36bb348422ee0ee7643b6c8090a43f6900f4
     and 94f303eda501c5ec8e20584ef29de2ce84bf8ed7