debian/0.42c-1rc2

bremner@unb.ca

09e7d40c · Merge branch 'master' into build · Nov 26, 2009

second try, with file conflict removed