Changes by: Aleksey Nogin (nogin at metaprl.org)
Date: 2006-11-29 10:58:31 -0800 (Wed, 29 Nov 2006)
Revision: 9788
Log message:

      - The -p and -P options only imply -k when no --no-k is given
      - Similarly, -P only implies -p when no --no-p is given