Merged these revisions from trunk: 2153-2164,2166,2168,2171

tbrehm

2011-01-11 04620b7ff00c194ae1bf4c398ebcb26d5c950b6a

1
ALTER TABLE `web_domain` ADD `document_root_www` VARCHAR( 255 ) NULL AFTER `document_root`;