merge of '707ad036e743d1d9e376f5872e832b2977285dc8'
authorMichael Lauer <mickey@vanille-media.de>
Sun, 29 Jun 2008 22:28:30 +0000 (22:28 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sun, 29 Jun 2008 22:28:30 +0000 (22:28 +0000)
     and 'a066601e9e566c2b3f758140100b9c2425bd110c'


Trivial merge