Merge branch 'master' of git://git.etalabs.net/musl
authornsz <nsz@port70.net>
Fri, 23 Mar 2012 10:16:56 +0000 (11:16 +0100)
committernsz <nsz@port70.net>
Fri, 23 Mar 2012 10:16:56 +0000 (11:16 +0100)

Trivial merge