merge of '96cde176098aad6ac5bbe96aa5d939a61de53f6d'
authorMichael Lauer <mickey@vanille-media.de>
Tue, 19 Feb 2008 16:17:07 +0000 (16:17 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Tue, 19 Feb 2008 16:17:07 +0000 (16:17 +0000)
     and 'c8560517964ebe70f94d18575236bb3b49f087b8'


Trivial merge