Merge "fix expat url" from git://github.com/take-cheeze/psplibraries.git