merge of '1e012394e595723b164ab2ffb09c796f3acc427f'
authorMichael Lauer <mickey@vanille-media.de>
Sat, 17 Nov 2007 15:13:09 +0000 (15:13 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sat, 17 Nov 2007 15:13:09 +0000 (15:13 +0000)
     and 'c6aac16390922aff6ad90c5bbf729c79ece62df3'


Trivial merge