Merge master.

diff --cc src/cxml.cc
index 2fa6de39b7749c6545a6701bb840b131455af675,05053ab1204667f44491d9030c9767607f4b57a9..185821c7eab3c42d1265c8743a39569960217547
--- 1/src/cxml.cc
--- 2/src/cxml.cc
+++ b/src/cxml.cc
@@@ -196,19 -196,13 +196,25 @@@ cxml::Node::content () cons
        return content;
  }
  
 -cxml::File::File (string file, string root_name)
+ string
+ cxml::Node::namespace_prefix () const
+ {
+       return _node->get_namespace_prefix ();
+ }
+ 
 +cxml::Document::Document (string root_name)
 +      : _root_name (root_name)
 +{
 +      _parser = new xmlpp::DomParser;
 +}
 +
 +cxml::Document::~Document ()
 +{
 +      delete _parser;
 +}
 +
 +void
 +cxml::Document::read_file (filesystem::path file)
  {
        if (!filesystem::exists (file)) {
                throw cxml::Error ("XML file does not exist");

diff --cc src/cxml.h
Simple merge