commit 5eaa799d0d57b46bc6a60099fdb5a3bbf8d18951
author Nan Zhang <zhangnan2920214@gmail.com> Mon Jul 29 16:57:22 2013 -0700
committer Nan Zhang <zhangnan2920214@gmail.com> Mon Jul 29 16:57:22 2013 -0700
tree e2eb6519d956930b2f63178fb69de531c6cb7816
parent ceab4c194923699fecb0d179d78095452751a7d5
parent 94e075b5c3db9aa613ef61c2581430a143b17bc8

Merge commit '94e075b5c3db9aa613ef61c2581430a143b17bc8' into nanzhang/hyracks_genomix

Conflicts:
	genomix/genomix-data/src/main/java/edu/uci/ics/genomix/type/KmerBytesWritable.java
	genomix/genomix-data/src/test/java/edu/uci/ics/genomix/data/test/KmerBytesWritableTest.java
	genomix/genomix-data/src/test/java/edu/uci/ics/genomix/data/test/KmerListWritableTest.java
	genomix/genomix-pregelix/src/main/java/edu/uci/ics/genomix/pregelix/io/MessageWritable.java
	genomix/genomix-pregelix/src/main/java/edu/uci/ics/genomix/pregelix/io/VertexValueWritable.java
	genomix/genomix-pregelix/src/main/java/edu/uci/ics/genomix/pregelix/operator/pathmerge/BasicGraphCleanVertex.java
	genomix/genomix-pregelix/src/main/java/edu/uci/ics/genomix/pregelix/operator/pathmerge/P1ForPathMergeVertex.java
	genomix/genomix-pregelix/src/main/java/edu/uci/ics/genomix/pregelix/operator/pathmerge/P3ForPathMergeVertex.java