merge of 2a35ebf8aac4cd73e0ac9369feb9250cedab4b65
authorMichael Lauer <mickey@vanille-media.de>
Sun, 15 Oct 2006 20:55:15 +0000 (20:55 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sun, 15 Oct 2006 20:55:15 +0000 (20:55 +0000)
     and c5ad8766630613eed09e775210fd8e2ce86c5a1d


Trivial merge