Commits for jlong

v251_base to v252_preview (2011-05-10 to 2011-05-17) v252

• NHGRI edits plus some updates
  • src/hg/makeDb/trackDb/cv/alpha/cv.ra - lines changed 403, context: html, text, full: html, text
• Resolving merge conflicts