Merge in a couple of small fixes.

Makefile.am

@@ -40,8 +40,8 @@ include docs/include.am
 
 TESTS += ${check_PROGRAMS}
 
-EXTRA_DIST+= \
-	     scripts/README.solaris
+EXTRA_DIST+= ${man_MANS}
+EXTRA_DIST+= scripts/README.solaris
 
 test: check
 

libgearman/universal.h

@@ -135,7 +135,7 @@ void gearman_universal_set_perror(const char *position, gearman_universal_st *un
 static inline const char *gearman_universal_error(const gearman_universal_st *gearman)
 {
   if (gearman->error.last_error[0] == 0)
-      return NULL;
+      return 0;
   return (const char *)(gearman->error.last_error);
 }
 

util/instance.cc

@@ -55,7 +55,6 @@ bool Instance::run()
   while (not _operations.empty())
   {
     Operation::vector::value_type operation= _operations.back();
-    assert(operation);
 
     switch (state)
     {