Merge branch 'nasm-2.09.xx'

diff --cc doc/changes.src
index cc9349e,d158371..e1b0d95
--- 1/doc/changes.src
--- 2/doc/changes.src
+++ b/doc/changes.src
@@@ -7,18 -7,12 +7,23 @@@
  The NASM 2 series support x86-64, and is the production version of NASM
  since 2007.
  
 +\S{cl-2.10} Version 2.10
 +
 +\b When optimization is enabled, \c{mov r64,imm} now optimizes to the
 +  shortest form possible between:
 +
 +\c      mov r32,imm32                   ;  5 bytes
 +\c      mov r64,imm32                   ;  7 bytes
 +\c      mov r64,imm64                   ; 10 bytes
 +
 +To force a specific form, use the \c{STRICT} keyword, see \k{strict}.
 +
  
+ \S{cl-2.09.02} Version 2.09.02
+ 
+ \b Fix reversed tokens when \c{%deftok} produces more than one output token.
+ 
+ 
  \S{cl-2.09.01} Version 2.09.01
  
  \b Fix NULL dereference on missed %deftok second parameter.

diff --cc preproc.c
Simple merge