Merge remote branch 'upstream/master'
authorLandon Fuller <landonf@bikemonkey.org>
Sat, 12 Feb 2011 15:23:19 +0000 (10:23 -0500)
committerLandon Fuller <landonf@bikemonkey.org>
Sat, 12 Feb 2011 15:23:19 +0000 (10:23 -0500)

Trivial merge