[systemtap/f20: 53/53] Merge branch 'f21' into f20

[fche]

commit 7394ea81c85289ee7b7858300c7481cb58ec5e1b
Merge: 27a0f62 eb58f6a
Author: Frank Ch. Eigler <fche at redhat.com>
Date:   Thu Feb 19 17:53:57 2015 -0500

    Merge branch 'f21' into f20
    
    * f21: (50 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
      Handle compressed module filenames (rhbz1150166)
      ...
    
    Conflicts:
    	.gitignore
    	sources
    	systemtap.spec

 .gitignore                             | 42 ++++++++++++++++++++++++++++++++++
 sources                                |  2 +-
 systemtap-2.6-compressed-modules.patch | 41 +++++++++++++++++++++++++++++++++
 systemtap.spec                         | 39 +++++++++++++++----------------
 4 files changed, 103 insertions(+), 21 deletions(-)
---
diff --cc .gitignore
index 7d96eb4,25151ee..53441a7
--- a/.gitignore
+++ b/.gitignore
@@@ -97,4 -97,45 +97,46 @@@ systemtap-1.3.tar.g
  /systemtap-2.5-0.491.gd0e1cd9d2fcb.tar.gz
  /systemtap-2.5-0.535.g9d4241d37eb1.tar.gz
  /systemtap-2.5.tar.gz
 +/systemtap-2.6.tar.gz
+ /systemtap-2.6-0.11.gbe329745a929.tar.gz
+ /systemtap-2.6-0.50.g684fe5014906.tar.gz
+ /systemtap-2.6-0.52.ge0da6e752b05.tar.gz
+ /systemtap-2.6-0.54.gb87b0305be62.tar.gz
+ /systemtap-2.6-0.62.gb50e1cd22c61.tar.gz
+ /systemtap-2.6-0.69.g27ce133c59da.tar.gz
+ /systemtap-2.6-0.112.g480ec383d00e.tar.gz
+ /systemtap-2.6-0.146.gc6c7b81a195e.tar.gz
+ /systemtap-2.6-0.175.gaa2eaf77df63.tar.gz
+ /systemtap-2.6-0.195.gc69af88fff8d.tar.gz
+ /systemtap-2.6-0.208.g035685897c43.tar.gz
+ /systemtap-2.6-0.240.g876abb05c522.tar.gz
+ /systemtap-2.6-0.299.gefa3ced615cc.tar.gz
+ /systemtap-2.6-0.411.gdf6c01e780a2.tar.gz
+ /systemtap-2.6.tar.gz
+ /systemtap-2.6-0.413.g6c14086f35f6.tar.gz
+ /systemtap-2.6-0.417.ga799c319d22f.tar.gz
+ /systemtap-2.6.tar.gz
+ /systemtap-2.7-0.1.ge4542435d372.tar.gz
+ /systemtap-2.7-0.18.gb8056bd23784.tar.gz
+ /systemtap-2.7-0.22.gf48e4f1c41b8.tar.gz
+ /systemtap-2.7-0.38.g3525152408f1.tar.gz
+ /systemtap-2.7-0.41.g4c651caa69cf.tar.gz
+ /systemtap-2.7-0.63.g9c7a7069e302.tar.gz
+ /systemtap-2.7-0.67.ga1a230af2ea5.tar.gz
+ /systemtap-2.7-0.68.gdc7bb409c5b8.tar.gz
+ /systemtap-2.7-0.70.g05b1f1672349.tar.gz
+ /systemtap-2.7-0.74.g6fb025aaaa35.tar.gz
+ /systemtap-2.7-0.83.g69f0706dd69b.tar.gz
+ /systemtap-2.7-0.93.g0cf3720fbd15.tar.gz
+ /systemtap-2.7-0.98.g08e54ea0a22d.tar.gz
+ /systemtap-2.7-0.103.gc1b1844eb23f.tar.gz
+ /systemtap-2.7-0.117.g8ccd746013fa.tar.gz
+ /systemtap-2.7-0.120.ge6f437adfe6d.tar.gz
+ /systemtap-2.7-0.131.g96ef4c2ab1ec.tar.gz
+ /systemtap-2.7-0.156.g7cd3311e3288.tar.gz
+ /systemtap-2.7-0.160.gef8a28eb7412.tar.gz
+ /systemtap-2.7-0.168.g2df78f1c4927.tar.gz
+ /systemtap-2.7-0.190.gfdffe7a8fc5f.tar.gz
+ /systemtap-2.7-0.244.gc1a369fb16d9.tar.gz
+ /systemtap-2.7-0.284.gc1e8354302ba.tar.gz
+ /systemtap-2.7.tar.gz