Merge remote-tracking branch 'nsz/math'
authorRich Felker <dalias@aerifal.cx>
Thu, 15 Nov 2012 13:37:58 +0000 (08:37 -0500)
committerRich Felker <dalias@aerifal.cx>
Thu, 15 Nov 2012 13:37:58 +0000 (08:37 -0500)

Trivial merge