merge of 'b9087aed5992eb3d85c7c859b89c4236a3d7e178'
authorMichael Lauer <mickey@vanille-media.de>
Sat, 1 Sep 2007 23:59:27 +0000 (23:59 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sat, 1 Sep 2007 23:59:27 +0000 (23:59 +0000)
     and 'de0f7d33bace1070e3a1202edc6e122f22d6873c'


Trivial merge