merge of '375a27e2a1e696f0e3ebd6e8faf905bae63a016c'
authorMichael Lauer <mickey@vanille-media.de>
Tue, 16 Oct 2007 19:12:31 +0000 (19:12 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Tue, 16 Oct 2007 19:12:31 +0000 (19:12 +0000)
     and '5e37b755f10936f81113606e76957fb837b04eda'


Trivial merge