merge of '9c56bb4603d094151503b996376d78874b9d938c'
authorMichael Lauer <mickey@vanille-media.de>
Tue, 19 Feb 2008 00:40:31 +0000 (00:40 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Tue, 19 Feb 2008 00:40:31 +0000 (00:40 +0000)
     and 'c8ce15d8b6944d0c337d5c2e89f0726b7dd895bf'


Trivial merge