37b8c33 Update to latest upstream; add patch for aether

Authored and Committed by galileo 9 years ago
    Update to latest upstream; add patch for aether
    
        
file modified
+12 -3