From: Rich Felker <dalias@aerifal.cx>
Date: Sat, 5 May 2012 00:56:01 +0000 (-0400)
Subject: Merge remote-tracking branch 'nsz/master'
X-Git-Tag: v0.9.0~16
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=dac791226a0f6fb8d19d83b63a837254f804dbac;p=oweals%2Fmusl.git

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

dac791226a0f6fb8d19d83b63a837254f804dbac