MADRID, Spain — International sailing's governing body re-elected its president, cut one event from its program for the next Olympics and changed boat types for one women's class at its annual general assembly.

The London Games will see 10 sailing events — six for men and four in the women's competition — down from the 11 featured in Beijing, after the ISAF voted Tuesday to leave the Tornado class out of the program for 2012.

President Goran Petersson was re-elected for a second four-year term after standing unopposed. The Swede, along with seven re-elected vice presidents, will serve through November 2012.

The International Sailing Federation, or ISAF, stood by an earlier decision to drop the fast and popular two-man Tornado class catamarans from the 2012 program.

The delegates also decided to change to format for women's three-crew keelboat races to one-on-one match races rather than fleet races, where all boats compete at the same time. As part of the that change, ISAF voted to drop the Yngling as the women's Olympic keelboat and replace it with the six-meter Elliott 6 for 2012.

The selection of events is now subject to approval by the International Olympic Committee, which is considered a formality.