Merge branch 'master' of git://git.etalabs.net/musl
authornsz <nsz@port70.net>
Mon, 26 Mar 2012 11:47:31 +0000 (13:47 +0200)
committernsz <nsz@port70.net>
Mon, 26 Mar 2012 11:47:31 +0000 (13:47 +0200)

Trivial merge