Merge remote branch 'upstream/master'
authorJohn Schulz <github.com@jfsiii.org>
Tue, 23 Nov 2010 18:05:38 +0000 (13:05 -0500)
committerJohn Schulz <github.com@jfsiii.org>
Tue, 23 Nov 2010 18:05:38 +0000 (13:05 -0500)

Trivial merge