merge of '3591fc910e3a0cb992f268a37048f34b281193d4'
authorMichael Lauer <mickey@vanille-media.de>
Wed, 14 Nov 2007 15:45:29 +0000 (15:45 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Wed, 14 Nov 2007 15:45:29 +0000 (15:45 +0000)
     and 'd30004f9fb76dfedd49611572e8a2fa9a9c043ee'


Trivial merge