merge of '6fb81274c29757880096f072fe570dfb0c670634'
authorMichael Lauer <mickey@vanille-media.de>
Wed, 26 Mar 2008 10:03:48 +0000 (10:03 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Wed, 26 Mar 2008 10:03:48 +0000 (10:03 +0000)
     and '98e87503fb19f28515c87f377b4b0723e00bc635'


Trivial merge