Merged revisions 2886-2909 from stable branch.

tbrehm

2012-01-25 355efb9a7f74a2035f595bbd0d03375710d08587

1
ALTER TABLE  `web_domain` ADD  `ipv6_address` VARCHAR( 255 ) default NULL AFTER  `ip_address`;