#
#
# patch "Makefile.am"
#  from [1ee09efd85fa97011e4223b1de46f120c9f4f774]
#    to [70043c329d95abd441f37ca2ed39ba3d45442252]
# 
# patch "commands.cc"
#  from [201104dd3c35567c7ac9ced82e52bb0f2d347eb1]
#    to [467a061fc8f1104d6c18bc306e4841297a329b83]
# 
# patch "mtn_cvs/Makefile.am"
#  from [f771366b8de2abf0e841977c948ad33bb66c41a6]
#    to [4b38ad07c4e54a7c470ed4425bdb03d7237b5fb4]
#
============================================================
--- Makefile.am	1ee09efd85fa97011e4223b1de46f120c9f4f774
+++ Makefile.am	70043c329d95abd441f37ca2ed39ba3d45442252
@@ -282,7 +282,7 @@ endif
   AM_CPPFLAGS += -DNETXX_NO_INET6
 endif
 
-SUBDIRS = po . mtn_cvs
+SUBDIRS = . mtn_cvs
 # extra files
 
 PDF_FIGURES= figures/branch-heads.pdf figures/cert.pdf			\
============================================================
--- commands.cc	201104dd3c35567c7ac9ced82e52bb0f2d347eb1
+++ commands.cc	467a061fc8f1104d6c18bc306e4841297a329b83
@@ -1,4 +1,4 @@
-// Copyright (C) 2002 Graydon Hoare <address@hidden>
+
 //               2007 Julio M. Merino Vidal <address@hidden>
 //
 // This program is made available under the GNU GPL version 2.0 or
@@ -20,7 +20,6 @@ using std::vector;
 // This file defines the logic behind the CMD() family of macros and handles
 // command completion.  Note that commands::process is in cmd.cc mainly for
 // better encapsulation of functions not needed in the unit tester.
-#endif
 
 namespace commands
 {
============================================================
--- mtn_cvs/Makefile.am	f771366b8de2abf0e841977c948ad33bb66c41a6
+++ mtn_cvs/Makefile.am	4b38ad07c4e54a7c470ed4425bdb03d7237b5fb4
@@ -6,7 +6,7 @@ libmtn_a_SOURCES=../netxx_pipe.cc ../san
 	../transforms.cc ../vocab.cc ../paths.cc ../charset.cc \
 	../simplestring_xform.cc ../constants.cc ../xdelta.cc \
 	../commands.cc ../basic_io.cc botan/md5.cpp piece_table.cc \
-	../mtn-sanity.cc ../package_revision.c ../option.cc \
+	../mtn-sanity.cc ../package_revision.cc ../option.cc \
 	../file_io.cc ../ssh_agent.cc ../specialized_lexical_cast.cc \
 	../gzip.cc ../lua.cc ../globish.cc ../pcrewrap.cc