Waldemar Brodkorb f14c1fc551 resolve merge conflict 12 年之前
..
patches a93dae2d59 readd needed patches 12 年之前
Makefile f14c1fc551 resolve merge conflict 12 年之前