test
Merge branch 'origin' of github.com:cloud2010/pdb-hadoop into origin

Conflicts:
	src/main/java/org/shmtu/cie/AtomCount.java
log4j
Merge branch 'origin' of github.com:cloud2010/pdb-hadoop into origin

Conflicts:
	src/main/java/org/shmtu/cie/AtomCount.java
log4j