Merge branch 'nigiri'

Conflicts:

	zebra/README

diff --cc lib/ZOOM/IRSpy.pm
index b1d07c7,16625d0..3e93b47
--- 1/lib/ZOOM/IRSpy.pm
--- 2/lib/ZOOM/IRSpy.pm
+++ b/lib/ZOOM/IRSpy.pm
@@@ -18,12 -18,13 +18,14 @@@ use ZOOM::IRSpy::Connection
  use ZOOM::IRSpy::Stats;
  use ZOOM::IRSpy::Utils qw(cql_target render_record
                          irspy_xpath_context irspy_make_identifier
 -                        irspy_record2identifier);
 +                        irspy_record2identifier calc_reliability_stats
 +                        modify_xml_document);
  
  our @ISA = qw();
- our $VERSION = '1.01';
+ our $VERSION = '1.02';
  our $irspy_to_zeerex_xsl = dirname(__FILE__) . '/../../xsl/irspy2zeerex.xsl';
+ our $debug = 0;
+ our $xslt_max_depth = 250;
  
  
  # Enumeration for callback functions to return

diff --cc lib/ZOOM/IRSpy/Utils.pm
Simple merge

diff --cc zebra/README
index ad36e4d,77b87b9..2898e93
--- 1/zebra/README
--- 2/zebra/README
+++ b/zebra/README
@@@ -103,6 -107,8 +107,7 @@@ or
  tar xzf records-2007-04-18.tar.gz
  zebraidx-2.0 init
  zebraidx-2.0 update zeerex.xml
- #zebraidx-2.0 update records-2010-04-06
+ zebraidx-2.0 update record-2010-04-06
  zebraidx-2.0 commit
+ 
  zebrasrv-2.0 -f yazserver.xml
 -