f39573f Merged master

Merged and Committed by bcl 13 years ago
    Merged master
    
    This sets the stage so that we can just do fast-forward merges from
    master in the future, keeping all branches in sync.
    
        
file modified
+3 -1
file removed
-58
file modified
+63 -8
file modified
+1 -1