Merge remote-tracking branch 'nsz/math'
authorRich Felker <dalias@aerifal.cx>
Sun, 18 Nov 2012 20:19:35 +0000 (15:19 -0500)
committerRich Felker <dalias@aerifal.cx>
Sun, 18 Nov 2012 20:19:35 +0000 (15:19 -0500)

Trivial merge