Hi!
I also have a riot with battery problem. I've taken it appart and removed the "plastic" on the battery to find it's a CGR18650HG
In fact, it's a samsung battery, model number ICR18650-18.(HG is not written on the battery, but the 18 written at the end of model number must stand for 1800 mAh. Dimension are corresponding: 0.7" dia by 2.56 " long.
Now, we've got to find a way to get some of those... any idea? Panasonic Canada tell that their distributor for Canada is digikey, but they don't have that model of battery.
Help! ;-)
Patrick
_________________________
Patrick