merge of '1f570b878b7faa73a50263f281ff2bad89d0e78b'
authorMichael Lauer <mickey@vanille-media.de>
Sun, 10 Feb 2008 15:14:10 +0000 (15:14 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sun, 10 Feb 2008 15:14:10 +0000 (15:14 +0000)
commit7fba1b3f2708865f7a0d60b0472d5ab84b85cfdd
tree1a56aaedb400cf06b0b211159fad4b03adeb2652
parented138a503d660dfdb8f1a09beced0b1d1ca86c98
parent05b83348e95642fa03c8da2d5142076357199e64
Merge ... '1f570b878b7faa73a50263f281ff2bad89d0e78b'
     and 'be55d0d4fe08efd2bd552157f130e03ccd5ac65a'