"amp" vs "m" in diagram. "uses" vs "builds on" -- parallelism restored


git-svn-id: http://es-lab.googlecode.com/svn/trunk@789 aeea10e6-ec39-11de-83d8-6d5adf01d787