merge of '2576615cdf291581844012f4b21f38bc8f07b3e5'
authorMichael Lauer <mickey@vanille-media.de>
Mon, 28 Jan 2008 13:58:06 +0000 (13:58 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Mon, 28 Jan 2008 13:58:06 +0000 (13:58 +0000)
     and 'e5a4ea76d9c872b195ecd4a8b3cf6e2c49849d72'


Trivial merge