merge of '5e5ed72728986531bc9fcd00f87f56051f1fbff5'
authorMichael Lauer <mickey@vanille-media.de>
Sat, 5 Jan 2008 19:25:48 +0000 (19:25 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sat, 5 Jan 2008 19:25:48 +0000 (19:25 +0000)
     and '897413a90458757cb227c0afbc74963d175a60a7'


Trivial merge