merge of '7c0a885daa3893962bf21628fe340b191ecb0259'
authorMichael Lauer <mickey@vanille-media.de>
Mon, 18 Feb 2008 15:28:23 +0000 (15:28 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Mon, 18 Feb 2008 15:28:23 +0000 (15:28 +0000)
     and 'fdb543591628f771630c9bdf28e86d3e0911be03'


Trivial merge