From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-840566-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
	by finch.gentoo.org (Postfix) with ESMTP id A153313888F
	for <garchives@archives.gentoo.org>; Thu, 15 Oct 2015 16:44:30 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id B7C4321C06D;
	Thu, 15 Oct 2015 16:44:23 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by pigeon.gentoo.org (Postfix) with ESMTPS id 7DA0121C06D
	for <gentoo-commits@lists.gentoo.org>; Thu, 15 Oct 2015 16:44:22 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id 877B6340C54
	for <gentoo-commits@lists.gentoo.org>; Thu, 15 Oct 2015 16:44:21 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id C409910CC
	for <gentoo-commits@lists.gentoo.org>; Thu, 15 Oct 2015 16:44:17 +0000 (UTC)
From: "Paul Varner" <fuzzyray@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Paul Varner" <fuzzyray@gentoo.org>
Message-ID: <1310607797.040600057ca333a4285e321a08bdf69cc0f11231.fuzzyray@gentoo>
Subject: [gentoo-commits] proj/gentoolkit:master commit in: /
X-VCS-Repository: proj/gentoolkit
X-VCS-Committer: fuzzyray
X-VCS-Committer-Name: Paul Varner
X-VCS-Revision: 040600057ca333a4285e321a08bdf69cc0f11231
X-VCS-Branch: master
Date: Thu, 15 Oct 2015 16:44:17 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: 8ae6a05a-0512-4966-9f3c-556e15c4d03f
X-Archives-Hash: 3880694b1fe49ffdce29eca7df6f700d

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