merge of 'd7806a43c44175ea7383681c5d772583a85125e1'
authorMichael Lauer <mickey@vanille-media.de>
Mon, 30 Jul 2007 23:35:01 +0000 (23:35 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Mon, 30 Jul 2007 23:35:01 +0000 (23:35 +0000)
     and 'fa875ca906ae242732b2af7d423dc0a019709730'


Trivial merge