From: Martin v. Löwis <martin@v.loewis.de>
Date: Sun, 5 Jun 2011 17:43:56 +0000 (+0200)
Subject: merge:Do not add txt files twice
X-Git-Tag: v3.3.0a1~2181
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=40b408d45538b49092c6f4194eba5517bd1fd69b;p=thirdparty%2FPython%2Fcpython.git

merge:Do not add txt files twice
---

40b408d45538b49092c6f4194eba5517bd1fd69b