merge of '5a3a0499fceb6465dab6ed321713520ddb11b854'
authorMichael Lauer <mickey@vanille-media.de>
Sat, 13 Jan 2007 13:37:18 +0000 (13:37 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sat, 13 Jan 2007 13:37:18 +0000 (13:37 +0000)
     and 'eb2b566b24f4dd2148641b262bb2abd63431eb19'


Trivial merge