See my update on my original post. I was being overly optimistic at first. (Chalk it up to reading the HRC announcement at the end of a long day and not thinking "hey, this came from the HCR and seems way too optimistic to be true") The update includes info from GovTrack.US about the actual conditions of the debate. It does not sound to me, unless I'm misremembering Robert's Rules of order (which is a distinct possibility, so feel free to correct me), that Tammy Baldwin will be able to offer her amendment.
This is a shame because it is so important that our legislators go on record on these matters. By preventing them from voting on the most inclusive and most comprehensive bill they are able to skirt important issues (like gender identity) but also become likely to pass legislation that will not protect the most vulnerable gays, lesbians, bisexuals, transgenderd folks, and yes even straight people: those who just don't conform to visual or behavioral gender expectations.
Remember, under the ENDA that will be debated tomorrow, they may not be able to fire you because you're gay, but they'll be allowed to fire you because you're too butch.
...because public space really matters!
Elizabeth