Merge branch 'gentoolkit' of git+ssh://git.overlays.gentoo.org/proj/gentoolkit into...
authordol-sen <brian.dolbec@gmail.com>
Thu, 14 Jul 2011 01:43:17 +0000 (18:43 -0700)
committerdol-sen <brian.dolbec@gmail.com>
Thu, 14 Jul 2011 01:43:17 +0000 (18:43 -0700)
commit040600057ca333a4285e321a08bdf69cc0f11231
treec34fc6816da64384795fa15ab8a4637274cd40db
parent59abbce2ffb3a430f22d450a77f2fc91ac13274b
parent0f177509d8384c822240f62d4416afa1ea56d540
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