Auto merge of #158 - mrmonday:fix-merge-fallout, r=mrmonday
Auto merge of #158 - mrmonday:fix-merge-fallout, r=mrmonday

Fix merge fallout from pull #147.

Accidentally lost these changes during rebasing/merging.

libpnet/libpnet,fsck/libpnet,fsck/libpnet,libpnet/libpnet,fsck/libpnet,symphorien/libpnet,mrmonday/libpnet,mrmonday/libpnet,symphorien/libpnet,libpnet/libpnet,symphorien/libpnet,symphorien/libpnet,mrmonday/libpnet,fsck/libpnet,mrmonday/libpnet,libpnet/libpnet