merge of '3c8bec0c02c0b0736b8c6cd5ae216848a8cbabf9'
authorMichael Lauer <mickey@vanille-media.de>
Thu, 6 Mar 2008 22:35:44 +0000 (22:35 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Thu, 6 Mar 2008 22:35:44 +0000 (22:35 +0000)
     and '79e634145baa64265863342297f7b440e08d7d22'


Trivial merge