merge of '2c5d0d8be360397528c4d116b6cbfb655cba6778'
authorMichael Lauer <mickey@vanille-media.de>
Sun, 29 Jun 2008 12:17:17 +0000 (12:17 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sun, 29 Jun 2008 12:17:17 +0000 (12:17 +0000)
commit1b412621bc4526a63fd6648dd5e81fa09b19bf3b
treec8591cf0b19e6d9c11d9ae2cdbeaa61174c82181
parente71b28f38ca9175242359b923f1e0f349fce469b
parent2f851962481db299d670c0adc30fd3d19f918844
Merge ... '2c5d0d8be360397528c4d116b6cbfb655cba6778'
     and '7c12c95bf9c72db33fe18c1e84311fba909db68b'