[tor-commits] [vidalia/alpha] Merge branch '5518_adv_tab_layout' into alpha