# 
# 
# patch "ChangeLog"
#  from [48e4e20861c242579415601e539fff859720f88d]
#    to [7044edcbf9586840754451d599adce80fd28085e]
# 
# patch "netsync.cc"
#  from [27a70a87812f97c4bd1974278111baa5a3355304]
#    to [ff048e5f5c432920b0ddbffbe0fb7133b8eb9f46]
# 
# patch "sqlite/parse.c"
#  from [a31a0cb5fd9be3781389e4b2784b197d03226dc4]
#    to [56d45a7fd03e7c499e1a0bacb81916956b9ec8d7]
# 
============================================================
--- ChangeLog	48e4e20861c242579415601e539fff859720f88d
+++ ChangeLog	7044edcbf9586840754451d599adce80fd28085e
@@ -1,3 +1,11 @@
+2006-02-16  Patrick Mauritz  <address@hidden>
+
+	* netsync.cc (handle_new_connection): Netxx::Address.get_name()
+	returns NULL every now and then. if so, continue with "" instead
+
+	* sqlite/parse.c: move #line under all #include directives so
+	the compiler can't be confused by it.
+
 2006-02-14  Richard Levitte  <address@hidden>
 
 	* Makefile.am (htmldir): Add variables so monotone.html is created
============================================================
--- netsync.cc	27a70a87812f97c4bd1974278111baa5a3355304
+++ netsync.cc	ff048e5f5c432920b0ddbffbe0fb7133b8eb9f46
@@ -2393,7 +2393,7 @@
                       app_state & app)
 {
   L(FL("accepting new connection on %s : %s\n") 
-    % addr.get_name() % lexical_cast<string>(addr.get_port()));
+    % (addr.get_name()?addr.get_name():"") % lexical_cast<string>(addr.get_port()));
   Netxx::Peer client = server.accept_connection();
   
   if (!client) 
============================================================
--- sqlite/parse.c	a31a0cb5fd9be3781389e4b2784b197d03226dc4
+++ sqlite/parse.c	56d45a7fd03e7c499e1a0bacb81916956b9ec8d7
@@ -1,13 +1,13 @@
 /* Driver template for the LEMON parser generator.
 ** The author disclaims copyright to this source code.
 */
 /* First off, code is include which follows the "include" declaration
 ** in the input file. */
 #include <stdio.h>
-#line 51 "parse.y"
 
 #include "sqliteInt.h"
 #include "parse.h"
+#line 54 "parse.y"
 
 /*
 ** An instance of this structure holds information about the