Merge remote branch 'nsz/master'
authorRich Felker <dalias@aerifal.cx>
Wed, 11 Apr 2012 18:59:36 +0000 (14:59 -0400)
committerRich Felker <dalias@aerifal.cx>
Wed, 11 Apr 2012 18:59:36 +0000 (14:59 -0400)
commitcc00f05632e5d7cbfb8ce49f4b0dfd59c3cf611d
tree1b31699a4a1f58d2362bcfe99f19059ee65b7048
parent4054da9ba062c694dc4fde5c577fcb6da7743bc9
parent37eaec3ad396ea4502f4aea2395b3b5f5f69a1c6
Merge remote branch 'nsz/master'