Commit 4bf01f012f2fa7dc2d22a659e1558ef8689f0803

Con Kolivas 2012-01-28T12:08:55

Fix potential overflow.