merge of '6686ff23579d58fcc1cd77385b2f7dab97200433'
authorMichael Lauer <mickey@vanille-media.de>
Sat, 9 Feb 2008 12:26:22 +0000 (12:26 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sat, 9 Feb 2008 12:26:22 +0000 (12:26 +0000)
     and 'a4d4654dbba442a770bc9686a79cb078180ead5b'


Trivial merge