Merge remote branch 'upstream/master'
authorJohn Schulz <github.com@jfsiii.org>
Thu, 2 Dec 2010 15:10:45 +0000 (10:10 -0500)
committerJohn Schulz <github.com@jfsiii.org>
Thu, 2 Dec 2010 15:10:45 +0000 (10:10 -0500)

Trivial merge