Added comments about the last merge (FreeBSD >=9 compatibility).