Merge branch 'master' into markj-kernel-config
Fix IPv6 in the same way that glebius@ did for IPv4 in r249894.
Merge branch '20130501-ip6-const-dst' into markj-develop