#6
Merge commit '0c23b23db217b11eab49058f211677d48aa63977'

Conflicts:
	flowdiff/src/ocha/itolab/flowdiff/applet/flowdiff/Drawer.java