markm c285f79bbb Revert/fix the most controversial parts of the last commit:
1) place __FBSDID() correctly IAW style(9).

2) revert (and slightly correct) a "complex" expression in an if()
   statement.
2002-03-07 14:11:41 +00:00
..
2001-03-27 10:52:19 +00:00