merge of '1b0d358e4f17bb597966cdc2eb4e9cb40b10077c'
authorMichael Lauer <mickey@vanille-media.de>
Wed, 12 Mar 2008 13:07:47 +0000 (13:07 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Wed, 12 Mar 2008 13:07:47 +0000 (13:07 +0000)
     and '64c15490c8902f07d7a60dd16090b960f56c4db7'


Trivial merge