Hmm... Well, i've got the exact battery in question in my laptop at the moment and I don't think you're ever going to get two hours out of it. Not being able to run it down to empty would seem to indicate something was wrong. Perhaps you could try booting it on a dos disk (or anything without APM) and see how long the battery lasts? That'd also give you the chance to compleetly cycle it, wich might be a good thing to do. You're sure someone hasn't changed the "shut off laptop when battery reaches x%" to something unreasonable?

Matthew