merge of '19345cff74205f76f6a9f18a8cbd4dd6bb2f4298'
authorMichael Lauer <mickey@vanille-media.de>
Mon, 25 Aug 2008 12:35:41 +0000 (12:35 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Mon, 25 Aug 2008 12:35:41 +0000 (12:35 +0000)
     and 'ae7c41d4de5eda76de5c1cb6a2a4fe160fbc9a1d'


Trivial merge