[glusterfs/el6] (4 commits) ...Merge remote-tracking branch 'origin/f18' into el6 glusterfs-3.3.1-15, BZ 955283, hardened build, i.

[Kaleb S. KEITHLEY]

Summary of changes:

  6d34e6e... Merge remote-tracking branch 'origin/master' into f18 (*)
  c47d66b... Merge remote-tracking branch 'origin/master' into f18 (*)
  6f40140... 3.3.1-15, BZ 955283, hardened build, i.e. PIE (*)
  535e4c3... Merge remote-tracking branch 'origin/f18' into el6 glusterf

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