merge of '2159dc39693944f0d5864c14aa1d9513f3cbefa0'
authorMichael Lauer <mickey@vanille-media.de>
Mon, 28 Jul 2008 22:02:21 +0000 (22:02 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Mon, 28 Jul 2008 22:02:21 +0000 (22:02 +0000)
     and 'd3210ecbfcc795109a513bb1c8bb6469047ed55d'


Trivial merge