Merge remote branch 'upstream/master'
authorJohn Schulz <github.com@jfsiii.org>
Tue, 7 Dec 2010 02:53:51 +0000 (21:53 -0500)
committerJohn Schulz <github.com@jfsiii.org>
Tue, 7 Dec 2010 02:53:51 +0000 (21:53 -0500)

Trivial merge