Had a few problems when updating from cvs tonight - long story short, the s2 layouts normally in the drop down in /customize are gone. They're still in the s2info table, but they're not showing up on customize (or in preview.bml) anymore.