merge of 292370be96ae823e50cc7a6150f75e83d93c1f58
authorMichael Lauer <mickey@vanille-media.de>
Thu, 26 Oct 2006 15:58:21 +0000 (15:58 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Thu, 26 Oct 2006 15:58:21 +0000 (15:58 +0000)
     and 73cdb33cdff28d6efe9fa72eb8012c492dc85d33


Trivial merge