merge of '838a60f4684a5fe71ade31d05fb35609808420d1'
authorMichael Lauer <mickey@vanille-media.de>
Fri, 14 Sep 2007 13:17:47 +0000 (13:17 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Fri, 14 Sep 2007 13:17:47 +0000 (13:17 +0000)
     and 'caed6636e646bb9b999bfe3a3234c92da9e20252'


Trivial merge