From: Bdale Garbee <bdale@gag.com>
Date: Tue, 8 Sep 2009 18:32:59 +0000 (-0600)
Subject: Merge commit 'upstream/2.10'
X-Git-Tag: debian/2.10-1~4
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;ds=sidebyside;h=d54e661a771b394610329fb0cd5e7b5002ae1708;hp=d54e661a771b394610329fb0cd5e7b5002ae1708;p=debian%2Fcpmtools

Merge commit 'upstream/2.10'

Conflicts:
	Makefile.in
	config.guess
	config.sub
---