888a13 Merge branch 'master' into f14/master

Merged and Committed by peter 14 years ago
    Merge branch 'master' into f14/master
    
    Conflicts:
    	erlang.spec
    
        
file modified
+2 -0
file modified
+22 -16
file modified
+2 -2
file modified
+2 -0