Preprocessor bug fixes for the '#' and '##' operators.
Authored by: plombo 2011-02-15
Parent: [r3010]
Child: [r3012]
