[glusterfs/f17: 11/11] Merge remote-tracking branch 'origin/f18' into f17

[Kaleb S. KEITHLEY]

commit e392cb72a96d83e8fcc7095b5235a1874d9b9cea
Merge: d839393 1d70e86
Author: Kaleb S. KEITHLEY <kkeithle at redhat.com>
Date:   Fri Jul 12 21:03:37 2013 -0400

    Merge remote-tracking branch 'origin/f18' into f17
    
    GlusterFS-3.3.2 GA, glusterfs-3.3.2-1

 glusterfs-3.3.2.libglusterfs.Makefile.patch |   24 ++
 glusterfs.spec                              |  468 ++++++++-------------------
 sources                                     |    6 +-
 3 files changed, 156 insertions(+), 342 deletions(-)
---