merge of '8e5f52d55ce4ef85a95a0677d76872828c00c442'
authorMichael Lauer <mickey@vanille-media.de>
Mon, 10 Mar 2008 20:17:37 +0000 (20:17 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Mon, 10 Mar 2008 20:17:37 +0000 (20:17 +0000)
     and 'be576e67ae1ad6b3f0b22b6e46bfdf8f3243c00e'


Trivial merge