commit - next round of libole2 fixes

[bob]

I went ahead and committed the last round of changes by Jamie.  The Windows build 
still doesn't compile, but I am going to take a look at Dom's suggestions and see what 
I can come up with.