[ucview/el6] (6 commits) ...Merge remote branch 'origin/master' into el6

[Robert Scheck]

Summary of changes:

  b91cfe4... Fix typo that causes a failure to update the common directo (*)
  2fb57b9... Upgrade to 0.31 (#530708) (*)
  f10ef1e... dist-git conversion (*)
  d59d4e3... Upgrade to 0.33 (#643107) (*)
  4d55f43... - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass (*)
  09a931e... Merge remote branch 'origin/master' into el6

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