* Some fixes to the previous commit (apparently it didn't compile with VS 2008)
* Some fixes to the previous commit (apparently it didn't compile with VS 2008)

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

Nipol/Siesta,Nipol/Siesta,Nipol/Siesta