merge of '11f2ba91ae8a56ab5343004cd4803a09a163d17b'
authorMichael Lauer <mickey@vanille-media.de>
Wed, 9 Jul 2008 12:12:54 +0000 (12:12 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Wed, 9 Jul 2008 12:12:54 +0000 (12:12 +0000)
     and '257e20c45c425e7969a0ba57313c01788d7066ef'


Trivial merge