[ucarp/el6] (7 commits) ...Merge branch 'f17' into el6

[Jon Ciesla]

Summary of changes:

  c423aa2... Fix typo that causes a failure to update the common directo (*)
  563767d... New upstream, noreplace for vip-up and vip-down. (*)
  30370f7... dist-git conversion (*)
  5b318e1... - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass (*)
  414ca79... - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass (*)
  3080009... Fix for crash. (*)
  278f2fe... Merge branch 'f17' into el6

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