merge of '3fcc49d84194b9665e260098b358d5a1848e697b'
authorMichael Lauer <mickey@vanille-media.de>
Tue, 11 Sep 2007 13:54:03 +0000 (13:54 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Tue, 11 Sep 2007 13:54:03 +0000 (13:54 +0000)
     and '86f3076c176e5860f297ef5a29fdd170ade23792'


Trivial merge