merge of 'bba23ca6193d5f2eb30e36c878736204560ca83d'
authorMichael Lauer <mickey@vanille-media.de>
Sat, 15 Sep 2007 23:22:36 +0000 (23:22 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sat, 15 Sep 2007 23:22:36 +0000 (23:22 +0000)
     and 'd23a37e33429ad715c4689a5170e23c795946d2e'


Trivial merge