Merge commit 'nima/xml'

Conflicts:
	debian/changelog
		Had the same changelog entry in both xml and master
		branch, with a minor wording difference.  Removed the
		duplicate and merged in the changelog entries from the
		XML branch

	src/dmidecode.c
		Merge process got confused by some functions which was not
		changed.  Removed the code coming from the master branch and
		let the XML be the base.

	src/setup-dbg.py
	src/setup.py
		In the XML branch, the version of the python-dmidecode is
		now a function which retrieves the version number from
		src/version.h.  Merged in this feature to master as well.

1 files changed, 14 insertions, 0 deletions

diff --git a/unit-tests/demo.h b/unit-tests/demo.h
new file mode 100644
index 0000000..21a5468
--- /dev/null
+++ b/unit-tests/demo.h
@@ -0,0 +1,14 @@
+#include <Python.h>
+#include <stdio.h>
+#include <string.h>
+#include <assert.h>
+
+#include <libxml/tree.h>
+#include "libxml_wrap.h"
+
+#include "dmixml.h"
+
+extern PyObject* demo_dump(void);
+PyMODINIT_FUNC initdemomodule(void);
+PyObject* demo_dump_doc(void);
+PyObject* demo_dump_node(void);