joyent/smartos-live — pull request #117 by nshalman (2012-09-12 17:37:33+00:00)
Title: toosl/update_base: rebase against origin/master

This allows tools/update_base to work when working in a topic branch