Merge remote-tracking branch 'remotes/gh-mjjstorey/master'
authorBenjamin Mako Hill <mako@atdot.cc>
Tue, 8 Nov 2011 03:35:45 +0000 (22:35 -0500)
committerBenjamin Mako Hill <mako@atdot.cc>
Tue, 8 Nov 2011 03:35:45 +0000 (22:35 -0500)

Trivial merge

Benjamin Mako Hill || Want to submit a patch?