[tor-commits] [vidalia/alpha] Merge branch '5522_vidaliaTab_settings' into alpha