merge of '1c81965a2b4441230dcc780cb75b714800217cf4'
authorMichael Lauer <mickey@vanille-media.de>
Mon, 5 May 2008 15:26:18 +0000 (15:26 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Mon, 5 May 2008 15:26:18 +0000 (15:26 +0000)
     and 'd61da5b80e9dd6d9c4abeb4bdba7558079f3ccdf'


Trivial merge