Merge branch 'master' into f21
    
    * master: (27 commits)
      upstream release 2.7
      Automated weekly systemtap rawhide release: 0.284.gc1e8354302ba
      Automated weekly systemtap rawhide release: 0.244.gc1a369fb16d9
      Automated weekly systemtap rawhide release: 0.190.gfdffe7a8fc5f
      Automated weekly systemtap rawhide release: 0.168.g2df78f1c4927
      Automated weekly systemtap rawhide release: 0.160.gef8a28eb7412
      Automated weekly systemtap rawhide release: 0.156.g7cd3311e3288
      Automated weekly systemtap rawhide release: 0.131.g96ef4c2ab1ec
      Automated weekly systemtap rawhide release: 0.120.ge6f437adfe6d
      Automated weekly systemtap rawhide release: 0.117.g8ccd746013fa
      Automated weekly systemtap rawhide release: 0.103.gc1b1844eb23f
      Automated weekly systemtap rawhide release: 0.98.g08e54ea0a22d
      Automated weekly systemtap rawhide release: 0.93.g0cf3720fbd15
      Automated weekly systemtap rawhide release: 0.83.g69f0706dd69b
      Automated weekly systemtap rawhide release: 0.74.g6fb025aaaa35
      Automated weekly systemtap rawhide release: 0.70.g05b1f1672349
      Automated weekly systemtap rawhide release: 0.68.gdc7bb409c5b8
      Automated weekly systemtap rawhide release: 0.67.ga1a230af2ea5
      Automated weekly systemtap rawhide release: 0.63.g9c7a7069e302
      Automated weekly systemtap rawhide release: 0.41.g4c651caa69cf
      ...
    
    Conflicts:
    	.gitignore
    	sources
    	systemtap.spec