7394292 Merge remote-tracking branch 'origin/master' into f17

Merged and Committed by fche 12 years ago
    Merge remote-tracking branch 'origin/master' into f17
    
    * origin/master:
      upstream release 1.8
    
    Conflicts:
    	systemtap.spec
    
        
file modified
+1 -0
file modified
+1 -1
file modified
+58 -87