merge of '0ad35e389f09a922b10c36c96396701c2d57f4b5'
authorMichael Lauer <mickey@vanille-media.de>
Fri, 8 Feb 2008 09:16:15 +0000 (09:16 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Fri, 8 Feb 2008 09:16:15 +0000 (09:16 +0000)
     and '58ac191dfd6484676031d3af5d00408929e5266e'


Trivial merge