merge of '7fb19ff722fe0f3e88a9d45230442af71ee72960'
authorMichael Lauer <mickey@vanille-media.de>
Wed, 9 Jul 2008 15:31:44 +0000 (15:31 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Wed, 9 Jul 2008 15:31:44 +0000 (15:31 +0000)
     and 'ae00760854aae829460c79c1907ca952c25f5a02'


Trivial merge