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)
commit85e3fa6d1b4627157bf6ef456b46dc6ceafe54c0
tree13c72b5e2fdf3f6725ea50202bbbcf806a9c2904
parentc89990a3ad932068192c24bb55b1a6c5d75786af
parentd2fadf2d1f345fab0956a05599b50a483d939c9a
Merge from devel

Benjamin Mako Hill || Want to submit a patch?