merged from devel
authorroot <root@epicenter>
Fri, 23 Jan 2009 18:58:28 +0000 (13:58 -0500)
committerroot <root@epicenter>
Fri, 23 Jan 2009 18:58:28 +0000 (13:58 -0500)

Trivial merge

Benjamin Mako Hill || Want to submit a patch?