Merge branch 'master' of github.com:sahlberg/libnfs
authorRonnie Sahlberg <ronniesahlberg@gmail.com>
Thu, 22 Nov 2012 00:45:03 +0000 (16:45 -0800)
committerRonnie Sahlberg <ronniesahlberg@gmail.com>
Thu, 22 Nov 2012 00:45:03 +0000 (16:45 -0800)

Trivial merge