merge of '2233080e8bdaa3d4a3eb8a016e6bb014d7c38e45'
authorMichael Lauer <mickey@vanille-media.de>
Sat, 9 Feb 2008 11:57:37 +0000 (11:57 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sat, 9 Feb 2008 11:57:37 +0000 (11:57 +0000)
     and '95c3495ce460c2f8f04e1188464c72bde51ce0c9'


Trivial merge