merge of '26da1e390ef5f5b958b6660965006568272d8f67'
authorMichael Lauer <mickey@vanille-media.de>
Fri, 19 Sep 2008 18:17:09 +0000 (18:17 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Fri, 19 Sep 2008 18:17:09 +0000 (18:17 +0000)
     and '4e8627d0e74554ef7b775c83e08f37f0fa0921a1'


Trivial merge