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

Trivial merge