[systemtap/f12/master: 19/20] Merge remote branch 'origin/f12/master' into f13/master

[roland]

commit 983d5945e8b0a10630ab589826ee383523c57751
Merge: a4ae729 cc1d8b0
Author: Roland McGrath <roland at redhat.com>
Date:   Thu Jul 29 19:56:33 2010 -0700

    Merge remote branch 'origin/f12/master' into f13/master
    
    Conflicts:
    	systemtap.spec

 systemtap.spec |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)
---