Merge branch 'rc3'
commit2f9ba0e9dab629441d96c84599dbe7f17c9be080
authorme <it@is.me>
Thu, 21 Aug 2008 03:38:08 +0000 (20 22:38 -0500)
committerme <it@is.me>
Thu, 21 Aug 2008 03:38:08 +0000 (20 22:38 -0500)
tree648668562580f29e26d6328a4e07283fc4336365
parent600b0969b1033f210f7e754710370cc63b030d1b
parentec92b83b3dd49e2ba317550b549bb33ec5e7be95
Merge branch 'rc3'

Conflicts:

libs.py.2.2_rc8.patch
pym/portage/dbapi/vartree.py
pym/portage/sets/libs.py
vartree.py.2.2_rc6.patch
libs.py.2.2_rc8.patch