Patch Set 3: Looks good to me, but someone else must approve; IP review completed

- fixed problems Shawn reported on patchset 2
- corrected commit message and added Igor's sign-off
- tested ok on Windows XP