Merge systemtap 0.6.0