merge of '1f88d7bce0e63ddda3e634a6aff8bcf09fc97ed7'
authorMichael Lauer <mickey@vanille-media.de>
Tue, 19 Feb 2008 19:27:26 +0000 (19:27 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Tue, 19 Feb 2008 19:27:26 +0000 (19:27 +0000)
     and 'f5e925a4d49eda729a2458839beb6944538b4ece'


Trivial merge