Backed out changeset b6c206049d8a The nvmemmory library depends on a modification to qemu; this change is therefore backed out in order to allow NVM functionality to be merged into graphics-phase-3 by transplanting individual commits.

# This is here so I can use 'wh' instead of 'which' in '~/bin/generic_python'
import which