Merge branch 'swann-with-json' into swann
Dan Brook [Thu, 6 May 2010 22:23:13 +0000 (23:23 +0100)]
1  2 
Makefile.PL

diff --cc Makefile.PL
Simple merge