merge of 'd64ac77a872f13513c87a0d8a234d5025cd4b8ab'
authorMichael Lauer <mickey@vanille-media.de>
Sat, 29 Mar 2008 16:34:58 +0000 (16:34 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sat, 29 Mar 2008 16:34:58 +0000 (16:34 +0000)
     and 'f818d337a5b7485dbab518f9a6b6d283edcc4f6b'


Trivial merge