d1a5b97 Update to upstream git commit 1b251bd

Authored and Committed by van 12 years ago
    Update to upstream git commit 1b251bd
    
        
file modified
+6 -3
file modified
+1 -1