Melanie 10f8c2ea9b Merge branch 'master' into presence-refactor ...

This merge was very conflicted. I think I got them all, but I can't be sure.
I had to merge to master or risk divergence to the point of unmergeability.

2010-01-16 00:05:08 +00:00

..

MXPClientView.cs

Merge branch 'master' into presence-refactor

2010-01-16 00:05:08 +00:00