From: Bdale Garbee <bdale@gag.com>
Date: Tue, 2 Nov 2010 02:41:50 +0000 (-0600)
Subject: Merge commit 'upstream/3.2.0'
X-Git-Tag: debian/3.2.0-1~3
X-Git-Url: https://git.gag.com/?p=debian%2Famanda;a=commitdiff_plain;h=42ff24f2a525d5965e1841b2ebe3ee0f4b918ac6

Merge commit 'upstream/3.2.0'

Conflicts:
	changer-src/chg-mcutil.sh
---

42ff24f2a525d5965e1841b2ebe3ee0f4b918ac6
diff --cc gnulib/regenerate/regenerate
index 6f42fa0,57565d7..57565d7
mode 100644,100755..100644
--- a/gnulib/regenerate/regenerate
+++ b/gnulib/regenerate/regenerate