manually merge differences with the trunk
authorFabian Groffen <grobian@gentoo.org>
Mon, 12 May 2008 19:35:30 +0000 (19:35 -0000)
committerFabian Groffen <grobian@gentoo.org>
Mon, 12 May 2008 19:35:30 +0000 (19:35 -0000)
commit90232b851e5666f28a17a5d66024e9de10fef4a6
tree05643ba72e22a8c8f40d1d5a6e913c6a43029ea2
parent28159897d021e3e3034dfd5207fea9d020170fcf
manually merge differences with the trunk

svn path=/main/branches/prefix/; revision=10309
16 files changed:
pym/portage_checksum.py
pym/portage_const.py
pym/portage_data.py
pym/portage_debug.py
pym/portage_dep.py
pym/portage_exception.py
pym/portage_gpg.py
pym/portage_localization.py
pym/portage_locks.py
pym/portage_mail.py
pym/portage_manifest.py
pym/portage_news.py
pym/portage_selinux.py
pym/portage_update.py
pym/portage_util.py
pym/portage_versions.py