a8724bb Merge branch 'master' into f15

Merged and Committed by Christopher Aillon 12 years ago
    Merge branch 'master' into f15
    
    Conflicts:
    	js.spec
    
        
file modified
+1 -0
file modified
+18 -15
file modified
+1 -0