merge of '1fc0d39fdc86680d51d6fec00f6cc3ba43d300f3'
authorMichael Lauer <mickey@vanille-media.de>
Sun, 3 Aug 2008 13:04:56 +0000 (13:04 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sun, 3 Aug 2008 13:04:56 +0000 (13:04 +0000)
     and '23cc848ee4d3462f245c833eadb2b673eb6ab921'


Trivial merge