Move Windows stuff to 2.2, so CVS builds won't interfere with 2.1
installations.
5 files changed