merge of '262ebdec7339ba774fffa1aa586eb226acd32493'
authorMichael Lauer <mickey@vanille-media.de>
Sun, 6 Apr 2008 22:19:45 +0000 (22:19 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sun, 6 Apr 2008 22:19:45 +0000 (22:19 +0000)
     and '7ce1c09c2ab95fc13a699ae089ac05fba3e7024c'


Trivial merge