merge of '3025e5e7a53ca716304775ca0ca1dc45ca4b0524'
authorMichael Lauer <mickey@vanille-media.de>
Sun, 9 Sep 2007 11:41:44 +0000 (11:41 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sun, 9 Sep 2007 11:41:44 +0000 (11:41 +0000)
commite4ef6eacfb2280a4d63cd569d691280fdf6b0e8f
tree08350103aa1a9fad46a2858ea49b014afddd70aa
parent5fff1e40328e6ab7967b55fbcd717c29d68a1d3f
parentd6833d3ab6f6b0c4078c9d0c46cb9d5dd0faea58
Merge ... '3025e5e7a53ca716304775ca0ca1dc45ca4b0524'
     and '60271e29029910207b8512833d049fad50fb282b'