[glusterfs/f18] (4 commits) ...fix an erroneous #else to %else, a twisty maze of passages, all alike

[Kaleb S. KEITHLEY]

Summary of changes:

  0d92f77... RHEL6 still needs the patches applied, even with grizzly, r (*)
  956b8e0... glusterfs-3.4.0-0.2alpha3, take two (*)
  a272e1f... glusterfs-3.4.0-02alpha3 take 3 (*)
  066251b... fix an erroneous #else to %else, a twisty maze of passages, (*)

(*) This commit already existed in another branch; no separate mail sent