fcbdf71 - Update to upstream release 3.1.2

Authored and Committed by toshio 14 years ago
    - Update to upstream release 3.1.2
    - Drop patch included upstream
    
        
file modified
+4 -30
file modified
+6 -2