[pypy-dev] merge of hpy-0.9