Okay, here's the sad story so far:
I have a (previously) unmodded G1, with normal T-Mobile software. Yesterday morning around 5AM I get the little notice that I can upgrade to Cupcake. Unfortunately, it's 5 in the morning, I couldn't sleep, and I wasn't thinking all that straight... so I...