merge of '38fe196c64aa6b2afd09cdb99be2946bea1525fe'
authorMichael Lauer <mickey@vanille-media.de>
Sat, 16 Jun 2007 15:23:30 +0000 (15:23 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sat, 16 Jun 2007 15:23:30 +0000 (15:23 +0000)
     and 'adaa9b640ea26a4d78d99bcb88d2c7562a138c25'


Trivial merge