Merge pull request #2814 from karalabe/dao-hard-finalcombo

accounts/abi/bind/backends/simulated.go

cmd/ethtest/main.go

cmd/geth/dao_test.go

cmd/geth/genesis_test.go

cmd/geth/main.go

cmd/geth/usage.go

cmd/utils/flags.go

core/bench_test.go

core/block_validator.go

core/blockchain_test.go

core/chain_makers.go

core/chain_makers_test.go

core/chain_pow_test.go

core/config.go

core/dao.go

core/dao_test.go

core/database_util_test.go

core/state_processor.go

eth/backend.go

eth/backend_test.go