[glusterfs/f17: 2/2] Merge remote-tracking branch 'origin/master' into f17 glusterfs-3.4.0beta2 including _hardened_build

[Kaleb S. KEITHLEY]

commit 74da373ae8257ad795fdfe55b968b0dbe3a85e7f
Merge: 67a6941 e27233f
Author: Kaleb S. KEITHLEY <kkeithle at redhat.com>
Date:   Fri May 24 09:48:12 2013 -0400

    Merge remote-tracking branch 'origin/master' into f17
    glusterfs-3.4.0beta2
    including _hardened_build and bzip compressed ChangeLog

 glusterfs.spec |  442 +++++++++++++++++++++++++++++++++++++++++---------------
 sources        |    6 +-
 2 files changed, 327 insertions(+), 121 deletions(-)
---