merge of '03e37205ddb308324f3e7b1e882c50510b125716'
authorMichael Lauer <mickey@vanille-media.de>
Fri, 1 Aug 2008 18:48:27 +0000 (18:48 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Fri, 1 Aug 2008 18:48:27 +0000 (18:48 +0000)
     and '9ed8a9e4b331c4c26542be80abb9775edaf8f5bf'


Trivial merge