merge of 'e24780d148b92ff2ae1162d9886e4a7befaf60da'
authorMichael Lauer <mickey@vanille-media.de>
Wed, 29 Aug 2007 14:52:10 +0000 (14:52 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Wed, 29 Aug 2007 14:52:10 +0000 (14:52 +0000)
     and 'eb765fb131a4212a65be90317c082f34cd4b4a41'


Trivial merge