merge of '2dd66e01098fdefc97b79f2c26ae0b399f517579'
authorMichael Lauer <mickey@vanille-media.de>
Thu, 13 Dec 2007 22:43:51 +0000 (22:43 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Thu, 13 Dec 2007 22:43:51 +0000 (22:43 +0000)
     and 'f4fae9004af31107f4f7bba2a4fae3dcb11bc1e5'


Trivial merge