merge of '74c5551c349d27c6ccb72cf2965707c633eb3cb9'
authorMichael Lauer <mickey@vanille-media.de>
Tue, 3 Jun 2008 11:38:35 +0000 (11:38 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Tue, 3 Jun 2008 11:38:35 +0000 (11:38 +0000)
commit5faf7780f65fa6df1d964606437585e79a1cb1d6
tree8f2e8b51d14e256a504d5fe453780b9c576cba91
parenta85bb4c46d5f14c09fd5578ed4b32d78fd08ccad
parent915c1e3654c4be1667a9390c3671d1a3601e2a56
Merge ... '74c5551c349d27c6ccb72cf2965707c633eb3cb9'
     and 'f275c97e2c93f0e846205b213e997b28ed0b148e'