Block r25522 from coming into /trunk. /trunk uses list macros now and 1.2 doesn...