Merged revisions 2173-2174 from stable branch.

tbrehm

2011-01-12 03bca94981b46d3b7e1251d11a91f7aeaef2143e

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