Merged revisions 2681-2739 from 3.0.4 stable branch.

tbrehm

2011-10-21 8ab3cdc09cfbac3157e996664616c229214f6c8d

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