Merge branch 'master' of github.com:sahlberg/libnfs
authorRonnie Sahlberg <ronniesahlberg@gmail.com>
Fri, 31 May 2013 00:59:24 +0000 (17:59 -0700)
committerRonnie Sahlberg <ronniesahlberg@gmail.com>
Fri, 31 May 2013 00:59:24 +0000 (17:59 -0700)

Trivial merge