merge of 'bc7f1f51525f7d568b5fe34877e1237d8d943cd6'
authorMichael Lauer <mickey@vanille-media.de>
Wed, 17 Oct 2007 14:22:45 +0000 (14:22 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Wed, 17 Oct 2007 14:22:45 +0000 (14:22 +0000)
     and 'be08cf05c894e5e60c1759dc02b5c26b50963906'


Trivial merge