0a21292 - Resync with master

Authored and Committed by law 11 years ago
      - Resync with master
      - Patch for 697421 has been submitted upstream.
      - Drop local patch for 691912 that is no longer needed.
    
        
file modified
+2 -0
file removed
-11
file modified
+18 -16
file modified
+2 -2