Merge branch 'master' into ff/rrdd

Conflicts:

	doc/rrdgraph.pod
	src/librrd.sym.in
	src/rrd_lastupdate.c
	src/rrd_update.c

diff --cc configure.ac
Simple merge

diff --cc doc/rrdgraph.pod
Simple merge

diff --cc doc/rrdtool.pod
Simple merge

diff --cc src/Makefile.am
index b11031c,a88eef3..663d1a1
--- 1/src/Makefile.am
--- 2/src/Makefile.am
+++ b/src/Makefile.am
@@@ -99,13 -100,8 +102,13 @@@ rrdtool_SOURCES = rrd_tool.
  rrdtool_DEPENDENCIES = librrd.la
  rrdtool_LDADD = librrd.la
  
 +rrdcached_SOURCES = rrd_daemon.c
 +rrdcached_DEPENDENCIES = librrd.la
 +rrdcached_CPPFLAGS = -DVERSION='"$(VERSION)"' -DLOCALSTATEDIR='"$(localstatedir)"'
 +rrdcached_LDADD = librrd.la
 +
  # strftime is here because we do not usually need it. unices have propper
  # iso date support
- EXTRA_DIST= strftime.c strftime.h \
+ EXTRA_DIST= strftime.c strftime.h  rrd_getopt.c rrd_getopt1.c rrd_getopt.h \
        win32comp.c  rrd_thread_safe_nt.c get_ver.awk librrd.sym
  

diff --cc src/librrd.sym.in
index 0000000,a178f55..22afc86
mode 000000,100644..100644
--- /dev/null
--- 2/src/librrd.sym.in
+++ b/src/librrd.sym.in
@@@ -1,0 -1,51 +1,57 @@@
+ rrd_clear_error
+ rrd_close
++rrd_cmd_flush
+ rrd_create
+ rrd_create_r
+ rrd_dontneed
+ rrd_dump
+ rrd_dump_r
+ rrd_fetch
+ rrd_fetch_r
+ rrd_first
+ rrd_first_r
+ rrd_flush
+ rrd_free
+ rrd_free_context
+ rrd_freemem
+ rrd_get_context
+ rrd_get_error
+ rrd_graph
+ rrd_graph_v
+ rrd_info
+ rrd_info_free
+ rrd_info_print
+ rrd_info_push
+ rrd_init
+ rrd_last
+ rrd_last_r
+ rrd_lastupdate
++rrd_lastupdate_r
+ rrd_lock
+ rrd_new_context
+ rrd_open
+ rrd_parsetime
+ rrd_proc_start_end
+ rrd_read
+ rrd_resize
+ rrd_restore
+ rrd_seek
+ rrd_set_error
+ rrd_set_to_DINF
+ rrd_set_to_DNAN
+ rrd_strerror
+ rrd_strversion
+ rrd_tell
+ rrd_test_error
+ rrd_tune
+ rrd_update
+ rrd_update_r
+ rrd_update_v
+ rrd_version
+ rrd_write
+ rrd_xport
++rrdc_connect
++rrdc_disconnect
++rrdc_flush
++rrdc_update
+ @RRD_GETOPT_LONG@

diff --cc src/rrd.h
Simple merge

diff --cc src/rrd_dump.c
Simple merge

diff --cc src/rrd_fetch.c
Simple merge

diff --cc src/rrd_graph.c
Simple merge

diff --cc src/rrd_info.c
Simple merge

diff --cc src/rrd_last.c
Simple merge

diff --cc src/rrd_lastupdate.c
index 37bdf74,e2ad334..120cf17
--- 1/src/rrd_lastupdate.c
--- 2/src/rrd_lastupdate.c
+++ b/src/rrd_lastupdate.c
@@@ -1,6 -1,5 +1,6 @@@
  /*****************************************************************************
-  * RRDtool 1.3.1  Copyright by Tobi Oetiker, 1997-2008
+  * RRDtool 1.3.2  Copyright by Tobi Oetiker, 1997-2008
 + *                Copyright by Florian Forster, 2008
   *****************************************************************************
   * rrd_lastupdate  Get the last datum entered for each DS
   *****************************************************************************/

diff --cc src/rrd_tool.c
Simple merge

diff --cc src/rrd_tool.h
Simple merge

diff --cc src/rrd_update.c
index b4466e1,d7ee4ac..04d81cc
--- 1/src/rrd_update.c
--- 2/src/rrd_update.c
+++ b/src/rrd_update.c
@@@ -1,7 -1,6 +1,7 @@@
  
  /*****************************************************************************
-  * RRDtool 1.3.1  Copyright by Tobi Oetiker, 1997-2008
+  * RRDtool 1.3.2  Copyright by Tobi Oetiker, 1997-2008
 + *                Copyright by Florian Forster, 2008
   *****************************************************************************
   * rrd_update.c  RRD Update Function
   *****************************************************************************

diff --cc src/rrd_xport.c
Simple merge