merged changes back from live
author<mako@atdot.cc> <>
Mon, 11 Feb 2008 15:50:53 +0000 (10:50 -0500)
committer<mako@atdot.cc> <>
Mon, 11 Feb 2008 15:50:53 +0000 (10:50 -0500)

Trivial merge

Benjamin Mako Hill || Want to submit a patch?