merge conflicts, coverity and other fixes
authorNathan S. Evans <evans@in.tum.de>
Thu, 4 Mar 2010 10:12:28 +0000 (10:12 +0000)
committerNathan S. Evans <evans@in.tum.de>
Thu, 4 Mar 2010 10:12:28 +0000 (10:12 +0000)
commitcdc66da331d8cd56c6d00c0c05b539a74ae96287
tree275f46c331e8289ec604d34ebae6d36e1290d6d4
parent83c760b3d3d5ebd5ba85ad1017b6b5bc2aa7405d
merge conflicts, coverity and other fixes
src/transport/plugin_transport_udp_nat.c