Merge pull request #1429 from obscuren/rebase-registrar

cmd/geth/blocktestcmd.go

cmd/geth/contracts.go

cmd/geth/js.go

cmd/geth/js_test.go

common/compiler/solidity.go

common/compiler/solidity_test.go

common/docserver/docserver.go

common/docserver/docserver_test.go

common/natspec/natspec.go

common/natspec/natspec_e2e_test.go

common/natspec/natspec_e2e_test.go.orig

common/registrar/contracts.go

common/registrar/ethreg/ethreg.go

common/registrar/registrar.go

common/registrar/registrar_test.go

common/resolver/contracts.go

common/resolver/resolver.go

eth/backend.go

jsre/pp_js.go

rpc/api/admin.go