Merged revisions 2301-2305 from stable branch.

tbrehm

2011-04-13 13b41c948607a0e97a49b637c2de46263d9ec94c

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