[systemtap/f17: 2/2] Merge remote-tracking branch 'origin/master' into f17

[fche]

commit 73942927f4a8d13a9a6cc6742452af4055134250
Merge: f395bbb 1908f80
Author: Frank Ch. Eigler <fche at redhat.com>
Date:   Sun Jun 17 13:33:33 2012 -0400

    Merge remote-tracking branch 'origin/master' into f17
    
    * origin/master:
      upstream release 1.8
    
    Conflicts:
    	systemtap.spec

 .gitignore     |    1 +
 sources        |    2 +-
 systemtap.spec |  145 ++++++++++++++++++++++---------------------------------
 3 files changed, 60 insertions(+), 88 deletions(-)
---