 +
 +VS_VERSION_INFO VERSIONINFO
 + FILEVERSION @RC_MODULE_VERSION@
-+ PRODUCTVERSION @RC_VERSION@,0
++ PRODUCTVERSION @RC_VERSION@
 + FILEFLAGSMASK 0x0L
 +#ifdef _DEBUG
 + FILEFLAGS VS_FF_PRERELEASE+VS_FF_DEBUG

 	../plugins/docsis/packet-bpkmrsp.c \
Index: packaging/nsis/Makefile.nmake
===================================================================
--- packaging/nsis/Makefile.nmake	(revision 26845)
+++ packaging/nsis/Makefile.nmake	(working copy)
@@ -47,6 +47,7 @@
 	../../plugins/agentx/agentx.dll \

+
+#define PROTO_ADD_TIME(tvb, tree, type, offset, head, field, name) \
+	do { \
+		time_t time;			\
+		time = head->field.tv_sec;	\
+		proto_tree_add_text(tree, tvb, offset + offsetof(type, field), \
+			sizeof(head->field), "" #name ": %s (%d ns)", ctime(&time), head->field.tv_nsec); \
+	} while (0)
+
+static const value_string packettypenames[] = {
