zmeny
Merge remote-tracking branch 'origin/trunk' into trunk

Conflicts:
	core/src/main/java/org/apache/mahout/cf/taste/eval/RecommenderBuilder.java