Merge branch 'nasm-2.03.x'

Conflicts:

	CHANGES

diff --cc CHANGES
index be74bca,3829b61..1b9b75b
--- 1/CHANGES
--- 2/CHANGES
+++ b/CHANGES
@@@ -1,13 -1,5 +1,13 @@@
- 2.03p1 (?)
- ------
 +2.04
 +----
 +* Sanitize macro handing in the %error directive.
 +* New %warning preprocessor directive.
 +* The -F option now implies -g.
 +* The Postscript/PDF documentation has been reformatted.
 +* __utf16__ and __utf32__ operators to generate UTF-16 and UTF-32 strings.
 +
+ 2.03.01
+ -------
  * Fix buffer overflow in the listing module.
  * Fix the handling of hexadecimal escape codes in `...` strings.