Fixed merge conflict
[easylist] / debian / compat
2010-09-13 Willem LiuFirst commit