merge of '32b7fa94caf6c038558548e252b9c813f4bf0891'
authorMichael Lauer <mickey@vanille-media.de>
Sun, 13 Jan 2008 19:06:20 +0000 (19:06 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sun, 13 Jan 2008 19:06:20 +0000 (19:06 +0000)
     and '51afccca79d0092ea2860950ddbfa96d1c141bb1'


Trivial merge