Merge 'and_or' into 'trunk'
-rw-r--r-- Changes
-rw-r--r-- INSTALL
-rw-r--r-- MANIFEST.SKIP
-rw-r--r-- Makefile.PL
drwxr-xr-x lib
drwxr-xr-x t