merge of 38117d57558bad2d7938536e244fcb6954590006
authorMichael Lauer <mickey@vanille-media.de>
Mon, 4 Sep 2006 10:11:38 +0000 (10:11 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Mon, 4 Sep 2006 10:11:38 +0000 (10:11 +0000)
     and b2f5c9fe90e9f2472e9d3ec0d1fdca6e3acd77e4


Trivial merge