Obviously another botched merge
No need for private. Not sure why these were declared as such.
Output an empty POOMCAL_MEETINGSTATUS property.

Possible fix for Bug: 12056
Explicitly set the MEETING_NOT_MEETING value.

Possible fix for Bug: 12056
Don't convert to Ansel_Style here, no need for it at this point.
Fix blocking CSS elements in HTML messages
Merge branch 'master' into imp_6_1

Conflicts:
	imp/lib/Mime/Viewer/Html.php