Merge from devel
authorselectricity <selectricity@epicenter>
Fri, 31 Aug 2007 21:39:00 +0000 (17:39 -0400)
committerselectricity <selectricity@epicenter>
Fri, 31 Aug 2007 21:39:00 +0000 (17:39 -0400)

Trivial merge

Benjamin Mako Hill || Want to submit a patch?