Merge remote-tracking branch 'origin/c1_aug2012' into c1_aug2012

Conflicts:
	openFaces/source/META-INF/resources/openfaces/util/util.js