Joint Chapter 7 Bankruptcy for Gay Couple?

This is a post to a consumer group list serve by a good friend of mine and a great lawyer in Long Beach, CA. 

I am preparing a Chapter 7 for a client of no particular significance until this came up today.  The client intends, this week, to get married because the California Supreme Court says he has a right to, a recent development.  If he gets married in a union recognized by the State of California as valid, but decidely not recognized by any federal courts, to my knowledge, do I file it as a an "individual married" case?  Better yet, do I include his new spouse's income when calculating the means test?  That may actually be a problem, as the spouse makes pretty decent money.  I haven't yet run the numbers to see if it will actually make a difference.

In reality, I'm going to ask my client to let me get his case on file this week before he gets married, to avoid all of this in this case.  But I am certain that this exact issue is going to come up, and soon,
and would love to hear any input the group has.

For what its worth, section 101 does not define "spouse" and niether does 302.  I'm guessing spouse means spouse under state law, and you go with that, "for better or worse", excuse the pun.

Jeffrey B. Smith