merge of 6e10609c36e07bf2bc3dc1f6840ff0cbb1fab3b5
authorMichael Lauer <mickey@vanille-media.de>
Sun, 24 Jul 2005 21:27:10 +0000 (21:27 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 24 Jul 2005 21:27:10 +0000 (21:27 +0000)
commit993f099fd774f49ff3cebeeb4503847d38251073
tree4578a8d68b003643da962d17f7c11a59abbd06ae
parentdf8ca63dbaea695b96349afafc5ed7baf2f72f43
parent4ee790cc6974bdfe1c9b06c0567b1c56f56d6615
merge of 6e10609c36e07bf2bc3dc1f6840ff0cbb1fab3b5
     and cacdd0f9881c1cd93f95e5d3bef2a2db8dea2d3b