[glusterfs/f17: 4/4] Merge remote-tracking branch 'origin/f18' into f17 glusterfs-3.3.1-15, BZ 955283, PIE hardening

[Kaleb S. KEITHLEY]

commit 67a69410fdeaab108d56f6114f5fbad7b7ee3d5e
Merge: 403f380 6f40140
Author: Kaleb S. KEITHLEY <kkeithle at redhat.com>
Date:   Mon May 13 08:46:08 2013 -0400

    Merge remote-tracking branch 'origin/f18' into f17
    glusterfs-3.3.1-15, BZ 955283, PIE hardening

 glusterfs.spec |  438 +++++++++++++++-----------------------------------------
 sources        |    6 +-
 2 files changed, 122 insertions(+), 322 deletions(-)
---