merge of '0d93ec84b30bc1bee2caaee72d667f87bc468a70'
authorMichael Lauer <mickey@vanille-media.de>
Sun, 23 Mar 2008 17:22:11 +0000 (17:22 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sun, 23 Mar 2008 17:22:11 +0000 (17:22 +0000)
     and '4d3f6129ff74b55c246c109b0515837fb4fcef27'


Trivial merge