[systemtap] (8 commits) ...The branches shall be as one!

[Josh Stone]

Summary of changes:

  cc32092... disable publican/fop/java on ppc(64) similar to ARM until w (*)
  f395bbb... fix merge (*)
  7394292... Merge remote-tracking branch 'origin/master' into f17 (*)
  4b73a1d... Merge branch 'f15' into f16 (*)
  454e443... Merge branch 'f15' into f17 (*)
  41f265f... Merge branch 'master' into f17 (*)
  134727e... Merge branch 'master' into f16 (*)
  349baef... The branches shall be as one! (*)

(*) This commit already existed in another branch; no separate mail sent