merge of '014e04809d6848b8f7c4ce43e57a9e89857ed8c9'
authorMichael Lauer <mickey@vanille-media.de>
Fri, 25 Jul 2008 11:28:04 +0000 (11:28 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Fri, 25 Jul 2008 11:28:04 +0000 (11:28 +0000)
     and '312397dbc5a5ae102fde8714c41666b07b74ee8a'


Trivial merge