merge of '7c9631167173e3ba316bc3efd67dece0804859a7'
authorMichael Lauer <mickey@vanille-media.de>
Sat, 18 Aug 2007 13:14:22 +0000 (13:14 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sat, 18 Aug 2007 13:14:22 +0000 (13:14 +0000)
commit5ae14e052c68c2666a1152e33ddb227455913766
tree3184723ef5ba421701086757dd45740988f5dff1
parent6a3b87ca8a581b43598c0b48b7727b24774e612e
parent7947162295fe03c2e2030312471bc6e306836891
Merge ... '7c9631167173e3ba316bc3efd67dece0804859a7'
     and '8ae2f68097943e0d2ab4479bb2e0e0a568de60fd'