#17425: null merge 3.2
authorMartin v. Loewis <martin@v.loewis.de>
Sun, 24 Mar 2013 21:10:20 +0000 (22:10 +0100)
committerMartin v. Loewis <martin@v.loewis.de>
Sun, 24 Mar 2013 21:10:20 +0000 (22:10 +0100)

Trivial merge