Dumb moment there Pete! Totally forgot
Here's a snippit:
Batteries Allowed in Carry-on Baggage
Dry cell alkaline batteries such as your typical AA, AAA, C, D, 9-volt, or button sized batteries that power most common small electrical or electronic items.
Dry cell rechargeable batteries such as Nickel Metal Hydride (NiMH) and Nickel Cadmium (NiCad). These kinds of batteries are similar to those used in flashlights or common electronic devices that are allowed on board the aircraft. These kinds of batteries should either be installed in the device, or safety packed such as in its original packaging from the store. If they are loose batteries, you could safety travel with them by putting them inside of individual sealable plastic bags, or by using tape or some other kind of covering on the battery terminal to protect the terminals from a short circuit.
Lithium ion batteries (including rechargeable lithium, lithium polymer, LIPO, secondary lithium) are allowed, but with some limits. Passengers may carry consumer-sized lithium ion batteries with no more than 8 grams of equivalent lithium content or 100 watt-hours (wh) of power per battery]. This size covers AA, AAA, 9-volt, cell phone, PDA, camera, handheld game, standard laptop computer batteries, or a camcorder battery. Passengers can also bring up to two larger lithium ion batteries that each contain between 8 and 25 grams of equivalent lithium content per battery in their carry-on luggage. This size covers larger extended-life laptop batteries.
Lithium metal batteries, including non-rechargeable lithium and primary lithium. These batteries are often used with cameras and other small personal electronics. Consumer-sized batteries (up to 2 grams of lithium per battery) may be carried. This includes all the typical non-rechargeable batteries for personal film cameras and digital cameras, as well as the flat round lithium button cells sometimes used for calculators.
Batteries Allowed in Checked Luggage
Except for spare (uninstalled) lithium batteries, and spillable wet cell batteries (the kind used in cars and motorcycles), all the batteries types allowed in carry-on baggage are also allowed in checked baggage. The batteries must be properly packed to prevent damage and short circuiting (terminals are prevented from touching metal). If it is installed in a device, the device should be turned off.
More on Lithium Batteries
The term "lithium battery" may refer to a lithium ion battery, lithium metal battery, or a lithium polymer battery. Lithium polymer batteries are a kind of lithium ion battery. Lithium ion batteries re rechargeable lithium batteries, like the ones found in cameras, cell phones, laptop computers, and radio-controlled toys. While smaller lithium ion batteries are allowed on aircraft, larger ones containing more than 25 grams Equivalent Lithium Content (ELC) are not. An indirect measure of ELC is watt-hours, with eight grams ELC being equal to about 100 watt-hours. If you are not sure of your battery's ELC or watt-hour measurement, or if your kind of battery is allowed on the flight, check with your airline or with the manufacturer of your battery.
Another kind of lithium battery that is banned from airliners are lithium metal batteries with more than two grams of lithium. The lithium metal batteries commonly used by consumers usually don't have this much lithium, but if you are unsure you should check.
http://www.faa.gov/about/office_org...fo/media/airline_passengers_and_batteries.pdf
Current guidelines set by the FAA (I would ask my uncle who flies an A380 but he's currently in Singapore)