Update from mergemerge_v1.0
tree9bd1b8ccaebba42c11255bc8ddbed5edc70a94c7
-rw-r--r-- 415 DESCRIPTION
-rw-r--r-- 952 NAMESPACE
drwxr-xr-x - R
drwxr-xr-x - inst
drwxr-xr-x - man
drwxr-xr-x - src
drwxr-xr-x - tests