What LGBT policies do the Democratic and Republican presidential candidates support?

According to lesbianlife.about.com, these are their stances:

John McCain
Gay Marriage: No
Civil Unions: No
Gay Adoption: No
LGBT Non-Discrimination Laws: No
Don't Ask, Don't Tell Military Policy: Yes

Barack Obama
Gay Marriage: No
Civil Unions: Yes
Gay Adoption: Yes
LGBT Non-Discrimination Laws: Yes
Don't Ask, Don't Tell Military Policy: No