merge of 'a1ae39784d60dda6b344012a273c0a4f2a339a97'
authorMichael Lauer <mickey@vanille-media.de>
Sat, 16 Aug 2008 16:19:55 +0000 (16:19 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sat, 16 Aug 2008 16:19:55 +0000 (16:19 +0000)
     and 'e5687f708388bd5700f6433bd38eecc7e0f1ebd1'


Trivial merge