Forward-port r39581 from the 1.6 trunk.
authorgerald <gerald@f5534014-38df-0310-8fa8-9805f1628bb7>
Tue, 25 Oct 2011 22:03:54 +0000 (22:03 +0000)
committergerald <gerald@f5534014-38df-0310-8fa8-9805f1628bb7>
Tue, 25 Oct 2011 22:03:54 +0000 (22:03 +0000)
commit34626374282c71a6459e10ee7d4d0c434eb3d398
treef44584ff96a1b36615755d0c194c5ad26b7289fe
parentc227baa535d8ce926266ffa6974e1fcdfd5c6c9b
Forward-port r39581 from the 1.6 trunk.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39582 f5534014-38df-0310-8fa8-9805f1628bb7
Makefile.am