espie c6287b2b53 fix @conflict marker
while there, put common things in Makefile.inc
bump revs according to discrepancies in COMMENT and in @conflict
2012-06-25 15:45:14 +00:00
..
2012-06-25 15:45:14 +00:00
2007-04-05 15:37:40 +00:00
2012-06-25 15:45:14 +00:00