From Christian Svensson, bug 6000 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6000) Cleaned up from the original patch svn path=/trunk/; revision=47606