init
init
init
init
init
Merge commit 'f234ec01542b1253a4ce93629d9380f285efb2e2'
Merge commit '46c796cf7593d91f716b01afca6689a8a4fb1d3f'

Conflicts:
	src/org/apache/hadoop/VecNorm.java