merge of 1b9b5e29f993b107b17de5dde1395f8dba168e17
authorMichael Lauer <mickey@vanille-media.de>
Tue, 19 Dec 2006 14:39:25 +0000 (14:39 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Tue, 19 Dec 2006 14:39:25 +0000 (14:39 +0000)
     and 863cf8497d2f9d72834bcd0acfde2f78ee0ccb72


Trivial merge