7ca3a7f Update to latest upstream

Authored and Committed by mbooth 8 years ago
    Update to latest upstream
    
    - Build with xmvn/tycho
    
        
file modified
+47 -10
file modified
+29 -40
file modified
+1 -1