How can I fix this time-zone problem with calendar events that started after installing Android 2.3? I'm using a Nexus One on T-Mobile in the US. A couple months ago my OS was updated to Android 2.3. Since then I've had a weird problem with my calendar events. 

I can view calendar events just fine, and the calendar syncs with my Google Account bi-directionally without issue.

When I create a calendar event, the "time zone" option defaults to my current time zone, "GMT -4, Eastern Standard Time", just like it did on Android 2.2. However, when I touch the time zone option to select a time zone, there are two time zone entries that match mine. One is "GMT -4, Eastern Standard Time", the other is "GMT -4, Eastern Time".

The problem happens when I edit an event. Frequently, when I edit a calendar entry, the event jumps 4 hours ahead unless I manually edit it back down. For example, if I create a calendar event and set the starting time to 1:00pm, when I edit the event I've created the edit screen will show a starting time of 5:00pm. It still shows the correct time zone, but it adds the 4 hour GMT difference into the event's starting time. If I save the event without adjusting it back down, the next time I edit it it will say 9:00pm. This happens regardless of whether the event was originally created on the phone, or if it was created on my desktop PC by visiting http://www.google.com/calendar. It doesn't seem to matter which of the two "US Eastern Time" options I select when creating an event on the phone. This problem did not exist before I installed Android 2.3. It doesn't happen with every single event, but I haven't been able to figure out what the common element is between the unaffected events. It does seem that events that are freshly-created are less prone to this problem (possibly the problem starts after the data's been synced a few times?)

If I create a calendar event on my phone, and then edit it on my desktop PC using http://www.google.com/calendar, the PC edit screen behaves normally, and the changes sync back to my phone without issue. Only when editing events on the phone do I experience this problem.

It's very annoying that I have to dial my events back 4 hours every time I make a change to them. I've experimented with different settings but I haven't been able to figure out how to make this go away. Does anybody know how I can fix this?
I had a problem with a secondary calendar which sounds similar. On edit the time zone changed. I went into the calendar and made sure all of them were set to my time zone. Each calendar has changeable time zone on Google calendars.