work on the macro stuff

--HG--
branch : trunk
3 files changed