configure.in:
  Auto merged
BitKeeper/etc/logging_ok:
  Auto merged
scripts/safe_mysqld.sh:
  merge nohup_niceness changes