From: Rich Felker <dalias@aerifal.cx>
Date: Sun, 6 May 2012 13:42:23 +0000 (-0400)
Subject: Merge remote-tracking branch 'nsz/master'
X-Git-Url: http://nsz.repo.hu/git/?a=commitdiff_plain;ds=sidebyside;h=a45de0cb94b58f1b5ea4af1ca3531c56dc02c0a2;hp=a45de0cb94b58f1b5ea4af1ca3531c56dc02c0a2;p=musl

Merge remote-tracking branch 'nsz/master'
---