merge of '031c775259e9fb4ce551180e6afdddbbefed9028'
authorMichael Lauer <mickey@vanille-media.de>
Sun, 26 Aug 2007 17:02:55 +0000 (17:02 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sun, 26 Aug 2007 17:02:55 +0000 (17:02 +0000)
     and '5780868a45dc58cf874f02cfc160c62adf208632'


Trivial merge