Merge branch 'master' of git://tinc-vpn.org/tinc into 1.1

Conflicts:
	NEWS
	README
	configure.in
	src/Makefile.am

diff --cc NEWS
index 1a121551245e7c0e49c244ab86342fa9bf9800c3,20a98d8ac1a0e07b8fa0d744816274725599e988..44366cdaea32a8b97dd8506252bb276b62ed77f7
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -1,10 -1,10 +1,16 @@@
-  * Fix ProcessPriority option under Windows.
 +Version 1.1-cvs              Work in progress
 +
 + * Use libevent to handle I/O events and timeouts.
 +
 + * Use splay trees instead of AVL trees.
 +
+ Version 1.0.15               June 24 2011
+ 
+  * Improved logging to file.
+ 
+  * Reduced amount of process wakeups on platforms which support pselect().
+ 
+  * Fixed ProcessPriority option under Windows.
  
  Version 1.0.14               May  8 2011
  

diff --cc README.git
Simple merge

diff --cc src/Makefile.am
index d9bf293ffeef1a11cd62440da8a956bcefc03bb8,ff011f8cfe7cf2559dd2f0e4aff845d83f227b5b..60709fb73c5b9248892a6b8f1d8e23a5dfe72fee
--- 1/src/Makefile.am
--- 2/src/Makefile.am
+++ b/src/Makefile.am
@@@ -40,7 -27,10 +40,7 @@@ if TUNEM
  LIBS += -lpcap
  endif
  
- AM_CFLAGS = @CFLAGS@ -DCONFDIR=\"$(sysconfdir)\" -DLOCALSTATEDIR=\"$(localstatedir)\" -DSBINDIR=\"$(sbindir)\"
 -tincd_LDADD = \
 -      $(top_builddir)/lib/libvpn.a
 -
 -AM_CFLAGS = -DCONFDIR=\"$(sysconfdir)\" -DLOCALSTATEDIR=\"$(localstatedir)\"
++AM_CFLAGS = -DCONFDIR=\"$(sysconfdir)\" -DLOCALSTATEDIR=\"$(localstatedir)\" -DSBINDIR=\"$(sbindir)\"
  
  dist-hook:
        rm -f `find . -type l`