merge of '188473a4d5d33bffe571a9035d4bf0a983b463f0'
authorMichael Lauer <mickey@vanille-media.de>
Tue, 19 Feb 2008 15:15:35 +0000 (15:15 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Tue, 19 Feb 2008 15:15:35 +0000 (15:15 +0000)
     and 'ce6927ecdedbeb4d51a0e9f5e35a8515cab0ab09'


Trivial merge