Merge branch 'master' of git://git.etalabs.net/musl
authornsz <nsz@port70.net>
Mon, 19 Mar 2012 22:55:06 +0000 (23:55 +0100)
committernsz <nsz@port70.net>
Mon, 19 Mar 2012 22:55:06 +0000 (23:55 +0100)

Trivial merge