merge of '2ee5368f3cc4e859f6bec4ecffc2dbc9385fa3d7'
authorMichael Lauer <mickey@vanille-media.de>
Tue, 31 Jul 2007 23:47:30 +0000 (23:47 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Tue, 31 Jul 2007 23:47:30 +0000 (23:47 +0000)
     and '62b5fc0f9207b54a854b0ea813248e4ab12bdb81'


Trivial merge