I have a two year old daughter. She means everything to me. I hope that if she were interested in pursuing a career in computer science there would be nothing to dissuade her. Unfortunately, given the lack of women in the field, the perception is that this is primarily a career for men.I have a one year old daughter, but I think my bias is one of a gritty commoner brought up surrounded by gritty, strong London women. Whatever my daughter ends up doing, I'd hope she can fight, drink, argue and cuss any of her male compatriots who dare piss her off under the table.
Most of the women I know and respect in our field are ass kickers. They have strong personalities (even if they're not outgoing) and speak their mind - most don't freak out about gender issues, even if they've had problems in the past, they nip things in the bud. I love these guys not because they're women or "feminine" but because they're being themselves, getting on with life and not using their gender as an excuse for doing anything differently.
Given this, I don't think we should make an extra effort to make women comfortable. We should make an overall effort to make people comfortable (I suspect most men don't like the bawdy "manly" behavior either), diminish the concept of gender and gender roles, and be more tolerant of each other.