Merge branch 'mdw+fixes'

diff --cc www-cgi/ucgi.c
Simple merge

diff --cc www-cgi/ucgi.h
Simple merge

diff --cc www-cgi/ucgicommon.c
index 090cc03a655a2b83627a02c59dc0655b970929c2,6ae266dcce97ff90dbb873e7edd5baaea1307480..4d371877911d5e2381717a34892939ba3b4ed73c
--- 1/www-cgi/ucgicommon.c
--- 2/www-cgi/ucgicommon.c
+++ b/www-cgi/ucgicommon.c
@@@ -16,9 -12,15 +16,12 @@@
   * General Public License for more details.
   *
   * You should have received a copy of the GNU General Public License
 - * along with userv-utils; if not, write to the Free Software
 - * Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 - *
 - * $Id$
 + * along with userv-utils; if not, see http://www.gnu.org/licenses/.
   */
  
+ #include <assert.h>
+ #include <ctype.h>
+ #include <stdarg.h>
  #include <stdio.h>
  #include <string.h>
  #include <errno.h>

diff --cc www-cgi/ucgitarget.c
Simple merge