Merge remote-tracking branch 'nsz/math'
authorRich Felker <dalias@aerifal.cx>
Mon, 14 Jan 2013 23:04:49 +0000 (18:04 -0500)
committerRich Felker <dalias@aerifal.cx>
Mon, 14 Jan 2013 23:04:49 +0000 (18:04 -0500)

Trivial merge