[glusterfs/el5: 2/2] Merge remote-tracking branch 'origin/master' into el5

[Kaleb S. KEITHLEY]

commit 933ef000090ca11aa92016cfe8203d54b5e0fda0
Merge: 2689525 d80b431
Author: Kaleb S. KEITHLEY <kkeithle at redhat.com>
Date:   Fri Sep 27 09:13:28 2013 -0400

    Merge remote-tracking branch 'origin/master' into el5

 .gitignore     |    1 -
 glusterfs.spec |  752 +-------------------------------------------------------
 sources        |    4 +-
 3 files changed, 14 insertions(+), 743 deletions(-)
---