vchoi_fork

[svn-r2211] took the development branch code and moved it into the release.  had to add some
conditional compile statements in the code to compile for the release.
defined a VERSION12 and VERSION13 macro.  all changes were surrounded by these statements