Merged revisions 2911-2912 from stable branch.

tbrehm

2012-01-26 31e0d15191bb745a03057544adb224f6f1ef67f2

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