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

[Kaleb S. KEITHLEY]

commit b17d7971c2b3dcf6537ce8d86127f546f6db9960
Merge: f6aff71 d80b431
Author: Kaleb S. KEITHLEY <kkeithle at redhat.com>
Date:   Fri Sep 27 09:05:13 2013 -0400

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

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