merge of '162bf228da944fcdae3d12cc94a424a78acc3dd1'
authorMichael Lauer <mickey@vanille-media.de>
Wed, 11 Jun 2008 16:22:38 +0000 (16:22 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Wed, 11 Jun 2008 16:22:38 +0000 (16:22 +0000)
     and 'f121ff59ddc88918fdbf4ca28a76373ee9ac4fb6'


Trivial merge