merge of 'bee9775a7c7c9473463045701aaa9f372e1173ce'
authorMichael Lauer <mickey@vanille-media.de>
Wed, 13 Feb 2008 17:22:03 +0000 (17:22 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Wed, 13 Feb 2008 17:22:03 +0000 (17:22 +0000)
     and 'e65ed9e5ef27495a6e0a27b271aaeb16c87cc317'


Trivial merge