Merge branch 'rc2'
commit600b0969b1033f210f7e754710370cc63b030d1b
authorworch <lucianposton@gmail.com>
Sun, 17 Aug 2008 07:46:20 +0000 (17 02:46 -0500)
committerworch <lucianposton@gmail.com>
Sun, 17 Aug 2008 07:46:20 +0000 (17 02:46 -0500)
tree4641c567da01c7e81666904b993bee217dde796e
parent4d9df5e7270dea7705161f465c77ba3fd57f29b0
parentca32041d6349a033b1c72fb033848f49a91cfc31
Merge branch 'rc2'

Conflicts:

pym/portage/dbapi/vartree.py
pym/portage/sets/libs.py