Merge branch 'master' into bkuhn/improve-installation-instructions user/bkuhn/improve-installation-instructions
authorBradley M. Kuhn <bkuhn@ebb.org>
Sat, 28 Apr 2012 21:41:59 +0000 (17:41 -0400)
committerBradley M. Kuhn <bkuhn@ebb.org>
Sat, 28 Apr 2012 21:41:59 +0000 (17:41 -0400)

Trivial merge