Merge remote-tracking branch 'nsz/math'
authorRich Felker <dalias@aerifal.cx>
Sat, 15 Dec 2012 05:49:09 +0000 (00:49 -0500)
committerRich Felker <dalias@aerifal.cx>
Sat, 15 Dec 2012 05:49:09 +0000 (00:49 -0500)

Trivial merge