Merge pull request #507 from pjd/fixes
authorMarc-André Moreau <marcandre.moreau@gmail.com>
Tue, 20 Mar 2012 13:44:24 +0000 (06:44 -0700)
committerMarc-André Moreau <marcandre.moreau@gmail.com>
Tue, 20 Mar 2012 13:44:24 +0000 (06:44 -0700)
Compilation fixes for FreeBSD.


Trivial merge