Merging svn trunk into master

diff --cc Changes
index 079420d,2da10ee..bc07902
--- 1/Changes
--- 2/Changes
+++ b/Changes
@@@ -2,3 -2,10 +2,10 @@@ Revision history for Test-NoTab
  
  0.1  2006-08-24
       - Module created and released on an unsuspecting world.
+ 
+ 0.2  2006-08-25
+      - Minor code changes and pod updates
+      - Added Makefile.PL for compatibility
+ 
+ 0.3  2006-08-26
 -     - Added missing dependancy (Test::Group)
++     - Added missing dependancy (Test::Group)

diff --cc MANIFEST
index d349091,c12d52a..507b365
--- 1/MANIFEST
--- 2/MANIFEST
+++ b/MANIFEST
@@@ -1,4 -1,5 +1,8 @@@
  Build.PL
++<<<<<<< HEAD:MANIFEST
++=======
+ Makefile.PL
++>>>>>>> trunk:MANIFEST
  Changes
  MANIFEST
  META.yml