merge of '6973c76c103f69158263106e5945c463a17c9759'
authorMichael Lauer <mickey@vanille-media.de>
Sun, 27 Jul 2008 11:31:31 +0000 (11:31 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sun, 27 Jul 2008 11:31:31 +0000 (11:31 +0000)
     and 'd0ceb396a5b7e7e0d8d4512700c0f717f80ff7bc'


Trivial merge