Merge 'trunk' into 'prefetch_redux'
Peter Rabbitson [Mon, 3 Aug 2009 16:01:44 +0000 (18:01 +0200)]
1  2 
Makefile.PL

diff --cc Makefile.PL
Simple merge