[netdisco/el5] (14 commits) ...Merge branch 'master' into el5

[gouldwp]

Summary of changes:

  ad691a5... *** empty log message *** (*)
  e778278... *** empty log message *** (*)
  d7e9f7b... *** empty log message *** (*)
  cba6ddb... *** empty log message *** (*)
  58afb60... *** empty log message *** (*)
  aec554a... *** empty log message *** (*)
  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. (*)
  a5f3232... Merge branch 'master' into el5

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