Release 3.0 merge into trunk

[Patricia Shanahan]

I think the next thing we need to do to make Release 3.0 a reality is to 
merge it into the trunk.

If you agree, I would like opinions on the best way to go about it. 
Ideally, we will preserve revision history for modules that have moved 
from one directory/package to another.