merge of '0a57519fa92d8220b35f8652e20fea9f7800058c'
authorMichael Lauer <mickey@vanille-media.de>
Wed, 5 Mar 2008 23:47:52 +0000 (23:47 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Wed, 5 Mar 2008 23:47:52 +0000 (23:47 +0000)
commit548954122ceda53a1d2cf13344b86d7f5cc443d4
treee043fe20350da120049a9980409d800fc123df3b
parentc26884da6913045c85e2343d87ca73f418f39c3a
parenta528ffada7e90c086da81d5a5416cb4d5cef11a4
Merge ... '0a57519fa92d8220b35f8652e20fea9f7800058c'
     and '905ae47594d02fc2167e9ddde4d4b781dad04ac2'