merge of 50b29d3f0371ac55da68a61f56708b4328771ff8
authorMichael Lauer <mickey@vanille-media.de>
Thu, 8 Sep 2005 13:18:05 +0000 (13:18 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 8 Sep 2005 13:18:05 +0000 (13:18 +0000)
commit0cba1cb3b9f68280a96055f281ff75b466d15313
treec1f37204f5abe459b0080cac79a669a45f509613
parentdc06355373aef876e6c900668e04e658d3d44f5a
parent2bdc23912a8699262097f5a654c0f61a283e346f
merge of 50b29d3f0371ac55da68a61f56708b4328771ff8
     and 720e5c152e58498fce88b9b5ca79a6b34544f057