Workaround for name conflict with WanT, courtesy of Alin Marin Elena


git-svn-id: http://qeforge.qe-forge.org/svn/q-e/trunk/espresso@11254 c92efa57-630b-4861-b058-cf58834340f0
Misc updates


git-svn-id: http://qeforge.qe-forge.org/svn/q-e/trunk/espresso@11255 c92efa57-630b-4861-b058-cf58834340f0