merge of '8fdaa25fd43ec0cd83b190b8b345a620111e66b9'
authorMichael Lauer <mickey@vanille-media.de>
Mon, 10 Mar 2008 23:18:23 +0000 (23:18 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Mon, 10 Mar 2008 23:18:23 +0000 (23:18 +0000)
     and 'de7f15da3dcec92630db3a43f280fdfa55e08a88'


Trivial merge