I upgraded through the Update Manager, and my buttons stayed on the right! I was all set beforehand to go directly into gconf and edit them back to where they should be, but was pleasantly surprised when I didn't have to!