merge of '99187c0da3a302acfa7fa4f93194f5f358f40d92'
authorMichael Lauer <mickey@vanille-media.de>
Mon, 1 Sep 2008 18:06:23 +0000 (18:06 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Mon, 1 Sep 2008 18:06:23 +0000 (18:06 +0000)
     and 'bfe16c15aa0c506913d70d09dc1dc9fcd8fabf94'


Trivial merge