merge of '1585e84b2f1f1c143a60c4d80cd9b5f9dfd1bfa7'
authorMichael Lauer <mickey@vanille-media.de>
Mon, 24 Dec 2007 13:36:38 +0000 (13:36 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Mon, 24 Dec 2007 13:36:38 +0000 (13:36 +0000)
     and 'a0bced98fc660149756ffa812a313c6b5fdbeaa1'


Trivial merge