updated macro stuff

--HG--
branch : trunk
2 files changed