[pypy-commit] pypy kill-gen-store-back-in: fix the merge

[fijal]

Author: Maciej Fijalkowski <fijall at gmail.com>
Branch: kill-gen-store-back-in
Changeset: r65955:132a6ea70bca
Date: 2013-08-06 10:56 +0200
http://bitbucket.org/pypy/pypy/changeset/132a6ea70bca/

Log:	fix the merge

diff --git a/rpython/rtyper/rclass.py b/rpython/rtyper/rclass.py
--- a/rpython/rtyper/rclass.py
+++ b/rpython/rtyper/rclass.py
@@ -76,7 +76,7 @@
 
 
 def buildinstancerepr(rtyper, classdef, gcflavor='gc'):
-    from rpython.rtyper.rvirtualizable2 import VirtualizableInstanceRepr
+    from rpython.rtyper.rvirtualizable import VirtualizableInstanceRepr
 
     if classdef is None:
         unboxed = []