- Partial revert of r15165: commented out "account.sql" settings in login_athena.conf so that it uses the SQL settings from inter_athena.conf (or import/inter_conf.txt)
- Partial revert of r15165: commented out "account.sql" settings in login_athena.conf so that it uses the SQL settings from inter_athena.conf (or import/inter_conf.txt)

git-svn-id: c1e39603916b71782cde5facdf0b79eff05c1414@15190 54d463be-8e91-2dee-dedb-b68131a5f0ec

Nipol/Siesta,Nipol/Siesta,Nipol/Siesta