merge of 'aadc54707d1990050b64f5354702d6454308b093'
authorMichael Lauer <mickey@vanille-media.de>
Tue, 22 Jul 2008 22:09:41 +0000 (22:09 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Tue, 22 Jul 2008 22:09:41 +0000 (22:09 +0000)
     and 'd2cf665b4d3013caa5979709d44b24fb0f2a9812'


Trivial merge