Added in the ipv6 patch.

Change-Id: I2d6257b9deb1f1fdec85dd89d799e69b04b1a462
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>