[glusterfs/f18] (4 commits) ...Merge remote-tracking branch 'origin/master' into f18

[Kaleb S. KEITHLEY]

Summary of changes:

  806ce30... Merge branch 'master' of ssh://pkgs.fedoraproject.org/glust
  43f3a1f... various fixes for the next build. see %change (*)
  f4adbd9... Merge branch 'f18' of ssh://pkgs.fedoraproject.org/glusterf
  85442fe... Merge remote-tracking branch 'origin/master' into f18

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