merged changes from the devel version post release release
authorBenjamin Mako Hill <mako@atdot.cc>
Wed, 23 Dec 2009 01:08:31 +0000 (20:08 -0500)
committerBenjamin Mako Hill <mako@atdot.cc>
Wed, 23 Dec 2009 01:08:31 +0000 (20:08 -0500)

Trivial merge

Benjamin Mako Hill || Want to submit a patch?