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

[Kaleb S. KEITHLEY]

commit c47d66b136a8087d94901b56dffc48e36cda7639
Merge: 6d34e6e da1d4f3
Author: Kaleb S. KEITHLEY <kkeithle at redhat.com>
Date:   Thu May 9 08:21:42 2013 -0400

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

 glusterfs.spec |  123 +++++++++++++++++++++++++++++--------------------------
 1 files changed, 65 insertions(+), 58 deletions(-)
---