1b5b2e3 - Rsync with upstream sources

Authored and Committed by law 11 years ago
      - Rsync with upstream sources
      - Drop 864820 patch as now that it's upstream.
      - Add sss to /etc/nsswitch.conf (#867473)
    
        
file modified
+2 -0
file removed
-38
file modified
+7 -5
file modified
+2 -2