Merge remote branch 'upstream/master'
authorLandon Fuller <landonf@bikemonkey.org>
Sun, 13 Feb 2011 13:55:53 +0000 (08:55 -0500)
committerLandon Fuller <landonf@bikemonkey.org>
Sun, 13 Feb 2011 13:55:53 +0000 (08:55 -0500)

Trivial merge