Test 6
Merge remote-tracking branch 'origin/jaas' into jaas

Conflicts:
	Alejandria/src/org/alejandria/util/Util.java