merge of '593b9e6f5ea7ab1790ec54c7599baf883f22f12b'
authorMichael Lauer <mickey@vanille-media.de>
Mon, 16 Oct 2006 14:35:49 +0000 (14:35 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Mon, 16 Oct 2006 14:35:49 +0000 (14:35 +0000)
     and '748258dba4c326c803882128fbda7609d96e2709'


Trivial merge