0a6b900 - Resync with upstream sources

Authored and Committed by law 11 years ago
     - Resync with upstream sources
      - Drop local patch for getconf.
      - Repack patchlist.
    
        
file modified
+2 -0
file modified
+8 -5
file modified
+2 -2