Branch merge, please cross-check

[acoliver]

I've merged the M1 branch into HEAD. The commit mail should have gone out. PLEASE cross check, especially your own M1/HEAD fixes. It was much to painless to have gone right.

Kabir: in particular check SMTPSender because I pretty much just took the head since it looked to have everything and more.

It all compiled pretty damn near first try. Either I'm dammed good or the more likely: http://www.apa.org/journals/psp/psp7761121.html

;-)

[mikea-xoba]

my stuff looks good :-)

btw, i don't think http://www.apa.org/journals/psp/psp7761121.html applies to our mail services lead!

[acoliver]

Thanks! Ah but there in lies the bind. Since I don't think it applies to you, but wouldn't be a good judge if it applied to me and vice versa... Then who knows, we could have incompetence clusters. That can spawn a whole new field of sociology or social psychology ;-)

[kabirkhan]

My stuff looks OK, but will check more thoroughly!