Waldemar Brodkorb f14c1fc551 resolve merge conflict 12 年之前
..
patches a5d38b1d44 readd required patch 12 年之前
Makefile f14c1fc551 resolve merge conflict 12 年之前