merge of 'adeeabec80174cc28a509847c43a6193d386e011'
authorMichael Lauer <mickey@vanille-media.de>
Sat, 26 Jul 2008 16:45:03 +0000 (16:45 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sat, 26 Jul 2008 16:45:03 +0000 (16:45 +0000)
commit7cff782b984312bb9d3226d9e44cb2b9a9401a81
tree5b96e35ed1bf95d8cbb4b7243d7fa731b549d27c
parent5e9d221edf100e3c54630d1214ae85840d75925c
parentd40d93ebbb3c5202125d8a1527f1aba1116a34c8
Merge ... 'adeeabec80174cc28a509847c43a6193d386e011'
     and 'cc5c410b6ecfd58ea2193cb45b120049db7eef5d'