non buildable commit
IMP-COD-AJ-20140108_01
IMP-COD-AJ-20140108_01

Conflicts:
	USPS.GSA.userprefs