merge of '5ffcacd9125004bbcb65a5f2d933272d313bee84'
authorMichael Lauer <mickey@vanille-media.de>
Mon, 19 May 2008 00:19:25 +0000 (00:19 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Mon, 19 May 2008 00:19:25 +0000 (00:19 +0000)
     and 'd78b6d9ef4e4f3d1ced7dfccfda038bcffbb221c'


Trivial merge