merge of '1ad3e9affaa2235122936cd88f0c15b045a4ac3b'
authorMichael Lauer <mickey@vanille-media.de>
Wed, 8 Oct 2008 09:10:16 +0000 (09:10 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Wed, 8 Oct 2008 09:10:16 +0000 (09:10 +0000)
     and '9ecdd345fb03610fa596e8cd5e8274e166e80087'


Trivial merge