Merge remote branch 'nsz/master'
authorRich Felker <dalias@aerifal.cx>
Tue, 20 Mar 2012 23:51:11 +0000 (19:51 -0400)
committerRich Felker <dalias@aerifal.cx>
Tue, 20 Mar 2012 23:51:11 +0000 (19:51 -0400)
commit58bf74850f5f7286dc290aa22ad982f50620a1c8
treead1d29dbdd40b13381f860f8900f8b0673dfa689
parentad47d45e9da8df364cb0a61b6146d51c196c8891
parent91c28f61f43ba029166772e8ac25808ea3c3dc98
Merge remote branch 'nsz/master'