Merge branch 'master' of git://git.etalabs.net/musl
authornsz <nsz@port70.net>
Tue, 20 Mar 2012 02:13:26 +0000 (03:13 +0100)
committernsz <nsz@port70.net>
Tue, 20 Mar 2012 02:13:26 +0000 (03:13 +0100)

Trivial merge