Clean up %pre and %end, rip ^M's out of %pre..
Authored by: lmayes 2011-02-12
Parent: [r1175]
Child: [r1177]