correct merge error
authorFabian Groffen <grobian@gentoo.org>
Sun, 27 Apr 2008 15:38:38 +0000 (15:38 -0000)
committerFabian Groffen <grobian@gentoo.org>
Sun, 27 Apr 2008 15:38:38 +0000 (15:38 -0000)
commitdfc6422a1af76bb245a57f022609dff9685c8753
treedf233c79403042a00ec65d8d069cffb69da844d0
parent2d7aab82359cda5987e1f091eb8721ee44f8c37c
correct merge error

svn path=/main/branches/prefix/; revision=10000
pym/portage/dbapi/vartree.py