Local vs. infinitesimal rigidity

Can someone please explain the difference between local rigidity and infinitesimal rigidity? Does either version of rigidity imply the other?

In particular, I'm thinking about Weil's rigidity theorem for hyperbolic metrics on manifolds of dimension $\geq 3$. I've seen it referred to as both local and infinitesimal, which further adds to my confusion about the distinction.

-
+1 This is a good question. If you find an answer off-MO, please repeat it here? – Sam Nead Aug 5 '10 at 19:15

Infinitesimal rigidity implies local rigidity, but not conversely. Local rigidity means a representation has no deformations, whereas infinitesimal rigidity means the natural tangent space to the character variety is 0-dimensional (this tangent space is a certain cohomology group with twisted coefficients). Weil proved both in the context you mention. See e.d. David Fisher's survey paper, where Weil's theorem is Theorem 3.2.