XUL locale
Merge branch 'master' of github.com:osmman/aui

Conflicts:
	aspectfaces-xul/src/main/xulrunner/chrome/content/javascript/locale.js