[netdisco/el6] (8 commits) ...Merge branch 'master' into el6

[gouldwp]

Summary of changes:

  4665eea... *** empty log message *** (*)
  0b4bf50... *** empty log message *** (*)
  461fc58... *** empty log message *** (*)
  e096ef4... Fix typo that causes a failure to update the common directo (*)
  b8dc15f... dist-git conversion (*)
  ca07d9d... - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass (*)
  a28ab46... netdisco 1.1 commit. (*)
  554c25a... Merge branch 'master' into el6

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