merge of '3802d5aa3022a434a47a62758a780bebfcff5c4d'
authorMichael Lauer <mickey@vanille-media.de>
Thu, 28 Feb 2008 10:40:25 +0000 (10:40 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Thu, 28 Feb 2008 10:40:25 +0000 (10:40 +0000)
     and 'a7772b5814e2f3ffb39d7d0d87094111a5bf3a45'


Trivial merge