merge of 'dd9ddcf7f0679e8a8bd188c7a05defba089c118d'
authorMichael Lauer <mickey@vanille-media.de>
Thu, 28 Feb 2008 11:41:46 +0000 (11:41 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Thu, 28 Feb 2008 11:41:46 +0000 (11:41 +0000)
     and 'fc5266affca09a60f8b05cce834b4c517e7e4003'


Trivial merge