Merge pull request #1 from jouvin/sl470-i386-spma

Misc. changes to SL4.7 32-bit templates