Commit db5227c40e5c35fe2ffb750f32b639cb44424a1d

Behdad Esfahbod 2011-04-11T13:16:08

Move macros around