Fixed a macro scoping bug discovered by ckknight introduced in one of the earlier changes for the 2.1 release.

--HG--
branch : trunk
2 files changed