From: Bdale Garbee <bdale@gag.com>
Date: Sun, 15 Feb 2009 19:41:31 +0000 (-0700)
Subject: Merge commit 'upstream/2.6.1'
X-Git-Tag: debian/2.6.1p1-1~33
X-Git-Url: https://git.gag.com/?p=debian%2Famanda;a=commitdiff_plain;h=afaa71b3866b46b082b6c895772e15b36d8865fe

Merge commit 'upstream/2.6.1'
---

afaa71b3866b46b082b6c895772e15b36d8865fe
diff --cc gnulib/regenerate/regenerate
index a32ab34,5669916..5669916
mode 100644,100755..100644
--- a/gnulib/regenerate/regenerate
+++ b/gnulib/regenerate/regenerate