merge of '702a5081576a1863ce14aecd10fdbf425bc547af'
authorMichael Lauer <mickey@vanille-media.de>
Mon, 18 Jun 2007 04:59:15 +0000 (04:59 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Mon, 18 Jun 2007 04:59:15 +0000 (04:59 +0000)
     and 'bdfe6dfd282c298e62007b6885e28ab01463c4bb'


Trivial merge