merge of bcb91ddbe21b7a5889fe98f3853d19ddcb2471cb
authorMichael Lauer <mickey@vanille-media.de>
Fri, 24 Mar 2006 10:28:25 +0000 (10:28 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 24 Mar 2006 10:28:25 +0000 (10:28 +0000)
commit29897e4068b700d0a3258d16184b86d239f9169b
tree225db3137e7f0eac3841b242659f78803e0a1735
parent5d85e7fc4152bc8b9478738ae2de60c7933dad7c
parenta579c9f67fe7a324fc798b25a4bf6695f01d7193
merge of bcb91ddbe21b7a5889fe98f3853d19ddcb2471cb
     and ff499565cdf6658417de4beeeba44d618266fd0d