Merged revisions 3536-3555 from 3.0.5 stable branch.

tbrehm

2012-10-16 a008884b8f041577d43675f13c492f45fb9ee066

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