merge of '9ea31290125f045b9aba7f495e83482e68ce640d'
authorMichael Lauer <mickey@vanille-media.de>
Sat, 14 Jun 2008 16:37:42 +0000 (16:37 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sat, 14 Jun 2008 16:37:42 +0000 (16:37 +0000)
     and 'c06fa0c45cd1c86ad35d00394ce13105f5d01c08'


Trivial merge