merge of 'c171a0d7bd9dab6cbbf1d894d770fab51475bd07'
authorMichael Lauer <mickey@vanille-media.de>
Sun, 13 Jan 2008 13:36:18 +0000 (13:36 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sun, 13 Jan 2008 13:36:18 +0000 (13:36 +0000)
     and 'd6039fc8233d21dd9be5522f8986b26912e70b0e'


Trivial merge