merge of '915c245097ab5f04957b45d8b76b60ece103e80d'
authorMichael Lauer <mickey@vanille-media.de>
Tue, 5 Feb 2008 15:06:51 +0000 (15:06 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Tue, 5 Feb 2008 15:06:51 +0000 (15:06 +0000)
     and 'bbd1c5e5e326b89d4cec6873eace6419f6d5130c'


Trivial merge