commit: 040600057ca333a4285e321a08bdf69cc0f11231
Author: dol-sen <brian.dolbec <AT> gmail <DOT> com>
AuthorDate: Thu Jul 14 01:43:17 2011 +0000
Commit: Paul Varner <fuzzyray <AT> gentoo <DOT> org>
CommitDate: Thu Jul 14 01:43:17 2011 +0000
URL: https://gitweb.gentoo.org/proj/gentoolkit.git/commit/?id=04060005
Merge branch 'gentoolkit' of git+ssh://git.overlays.gentoo.org/proj/gentoolkit
into gentoolkit
Conflicts:
pym/gentoolkit/revdep_rebuild/collect.py
pym/gentoolkit/revdep_rebuild/rebuild.py
pym/gentoolkit/revdep_rebuild/settings.py
pym/gentoolkit/revdep_rebuild/stuff.py