merge 11442 NEWS
authorMartin v. Löwis <martin@v.loewis.de>
Sun, 17 Apr 2011 20:56:19 +0000 (22:56 +0200)
committerMartin v. Löwis <martin@v.loewis.de>
Sun, 17 Apr 2011 20:56:19 +0000 (22:56 +0200)
1  2 
Misc/NEWS

diff --cc Misc/NEWS
Simple merge