merge of '0bbc4414a3d984fe899446fe3d8f50b9238cc3dc'
authorMichael Lauer <mickey@vanille-media.de>
Sat, 16 Feb 2008 19:54:00 +0000 (19:54 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sat, 16 Feb 2008 19:54:00 +0000 (19:54 +0000)
     and '98f85bb96baab42bb0d213a35c2cd9f1c06a3f47'


Trivial merge