Merge remote branch 'remotes/origin/fix-reset'
authorBdale Garbee <bdale@gag.com>
Thu, 6 May 2010 18:47:30 +0000 (12:47 -0600)
committerBdale Garbee <bdale@gag.com>
Thu, 6 May 2010 18:47:30 +0000 (12:47 -0600)

Trivial merge