merge of '69accd77bc1602a9ed5957e6db7754b669a5e8ea'
authorMichael Lauer <mickey@vanille-media.de>
Wed, 30 Jan 2008 09:17:50 +0000 (09:17 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Wed, 30 Jan 2008 09:17:50 +0000 (09:17 +0000)
commita87a2ebb1845dc818a46b80054bcb0370450ae41
tree32209e7579e58fb9e3f0aa2574f667cae4d0ecad
parent489bdfa4573e3d1a4c3b16fd704b83170158e29f
parent5e8b5638942148711880a4f51bfc632440680253
Merge ... '69accd77bc1602a9ed5957e6db7754b669a5e8ea'
     and '77255eff938f77a73e2bcaf9e08a9568e2c88208'