Merge branch 'upstream' master
authorBenjamin Mako Hill <mako@atdot.cc>
Sun, 13 Feb 2011 16:04:24 +0000 (11:04 -0500)
committerBenjamin Mako Hill <mako@atdot.cc>
Sun, 13 Feb 2011 16:04:24 +0000 (11:04 -0500)

Trivial merge

Benjamin Mako Hill || Want to submit a patch?