manually merge differences with the trunk
authorFabian Groffen <grobian@gentoo.org>
Mon, 12 May 2008 19:26:22 +0000 (19:26 -0000)
committerFabian Groffen <grobian@gentoo.org>
Mon, 12 May 2008 19:26:22 +0000 (19:26 -0000)
commit28159897d021e3e3034dfd5207fea9d020170fcf
treeac3568b2272016a378a4b8a9ac2c74c003fa022c
parent47a5a69772ae555a4ec85e489264c244af7b266a
manually merge differences with the trunk

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