merge of '4a597627acd6eec179bb1a03405d92cf8b871ac0'
authorMichael Lauer <mickey@vanille-media.de>
Mon, 30 Jul 2007 11:15:39 +0000 (11:15 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Mon, 30 Jul 2007 11:15:39 +0000 (11:15 +0000)
     and '6c89e16689bde0d5bff8b0e47eea04a458190a56'


Trivial merge