Waldemar Brodkorb f14c1fc551 resolve merge conflict 12 年之前
..
patches d6561e7d59 update to latest upstream version 14 年之前
Makefile f14c1fc551 resolve merge conflict 12 年之前