Merge 'trunk' into 'current'
Brandon Black [Fri, 8 Jun 2007 01:13:41 +0000 (01:13 +0000)]
r32211@brandon-blacks-computer (orig r3481):  blblack | 2007-06-07 20:11:22 -0500
update versions for 0.04000 release, added some better feature stuff to Makefile.PL


Trivial merge