Merge remote branch 'origin/rel1.2' into rel1.2

Conflicts:
	scripts/bugdetect/bugcounting
	scripts/bugdetect/bugfiltering
	scripts/bugdetect/bugmerging
	scripts/bugdetect/bugordering
	scripts/bugdetect/bugtypecounting
	scripts/bugdetect/mergecomments
	scripts/clonedetect/cd_coverage
	scripts/clonedetect/config-sample
	scripts/clonedetect/configure
	scripts/clonedetect/deckard.sh
	scripts/clonedetect/generateparam
	scripts/clonedetect/paramsetting
	scripts/clonedetect/post_process_groupfile
	scripts/clonedetect/vdbgen
	scripts/clonedetect/vertical-param-batch
	src/include/ptree.h
	src/main/Makefile
	src/main/bugmain.cc
	src/main/build.sh
	src/main/clean.sh
	src/main/main.cc
	src/main/out2html.C
	src/main/out2xml.C
	src/main/parseTreeMain.cc
	src/main/ptree.cc
	src/ptgen/Makefile
	src/ptgen/gcc/Makefile
	src/ptgen/gcc/catomicNodes.h
	src/ptgen/gcc/ccontextualNodes.h
	src/ptgen/gcc/cparentNodes.h
	src/ptgen/gcc/crelevantNodes.h
	src/ptgen/gcc/main.cc
	src/ptgen/gcc/mainc.py
	src/ptgen/java/Makefile
	src/ptgen/java/jatomicNodes.h
	src/ptgen/java/jcontextualNodes.h
	src/ptgen/java/jparentNodes.h
	src/ptgen/java/jrelevantNodes.h
	src/ptgen/java/main.cc
	src/ptgen/java/mainj.py
	src/ptgen/php5/Makefile
	src/ptgen/php5/mainphp.py
	src/ptgen/php5/phpatomicNodes.h
	src/ptgen/php5/phpcontextualNodes.h
	src/ptgen/php5/phpparentNodes.h
	src/ptgen/php5/phprelevantNodes.h
	src/ptgen/simple/Makefile
	src/ptgen/simple/main.cc
	src/ptgen/simple/tokid.h
	src/ptgen/yacc.g
	src/vgen/tra-gen-test.C
	src/vgen/treeTra/Makefile
	src/vgen/treeTra/clone-context-php.C
	src/vgen/treeTra/clone-context-php.h
	src/vgen/treeTra/node-vec-gen.C
	src/vgen/treeTra/node-vec-gen.h
	src/vgen/treeTra/sq-tree.C
	src/vgen/treeTra/sq-tree.h
	src/vgen/treeTra/token-counter.C
	src/vgen/treeTra/token-counter.h
	src/vgen/treeTra/token-tree-map.C
	src/vgen/treeTra/token-tree-map.h
	src/vgen/treeTra/tra-gen.C
	src/vgen/treeTra/tra-gen.h
	src/vgen/treeTra/tree-accessor.C
	src/vgen/treeTra/tree-accessor.h
	src/vgen/treeTra/tree-traversal.C
	src/vgen/treeTra/tree-vector.C
	src/vgen/treeTra/tree-vector.h
	src/vgen/treeTra/vector-merger.C
	src/vgen/treeTra/vector-merger.h
	src/vgen/treeTra/vector-output.C
	src/vgen/treeTra/vector-output.h
	src/vgen/treeTra/vgen-config.C
	src/vgen/treeTra/vgen-config.h
	src/vgen/treeTra/vgen-utils.c
	src/vgen/treeTra/vgen-utils.h
	src/vgen/vgrouping/Makefile
	src/vgen/vgrouping/computeranges.c
	src/vgen/vgrouping/dispatchvectors.c
	src/vgen/vgrouping/rundispatch
	src/vgen/vgrouping/rundispatchonefile
	src/vgen/vgrouping/runsplit
	src/vgen/vgrouping/runvectorsort
	src/vgen/vgrouping/split.c
	src/vgen/vgrouping/vectorsort.c