merge of '2b134fb4a5278b379deec7fbafe34576ac3f266c'
authorMichael Lauer <mickey@vanille-media.de>
Thu, 6 Mar 2008 17:13:43 +0000 (17:13 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Thu, 6 Mar 2008 17:13:43 +0000 (17:13 +0000)
     and 'e86cbb0aa6849e39a142ce4c582d140b921326d1'


Trivial merge