merge of '42ff2b39da1a828b39b2827ebefd91262b2ea728'
authorMichael Lauer <mickey@vanille-media.de>
Sat, 27 Sep 2008 18:49:28 +0000 (18:49 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sat, 27 Sep 2008 18:49:28 +0000 (18:49 +0000)
     and '513ef8343cdc8a1d5beb9c8fa5298efc58162ffe'


Trivial merge