Merged revisions 2911-2912 from stable branch.

tbrehm

2012-01-26 31e0d15191bb745a03057544adb224f6f1ef67f2

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