=== modified file 'kicad/minizip/CMakeLists.txt'
--- kicad/minizip/CMakeLists.txt	2010-09-18 17:55:08 +0000
+++ kicad/minizip/CMakeLists.txt	2010-12-18 19:57:34 +0000
@@ -11,7 +11,7 @@
     # Unfortunately, we have no way to know exactlty the path of zlib.h becuase this file
     # is in wxWidgets sources, not in wxWidgets include path.
     find_path(ZLIB_INCLUDE_DIR zlib.h PATHS ${wxWidgets_ROOT_DIR}/../src/zlib/ ${wxWidgets_ROOT_DIR}/src/zlib/ DOC "location of zlib include files")
-	find_file(ZLIB_LIBRARIES NAMES ${wxWidgets_LIB_DIR}/libwxzlib-2.8.a ZLIB_LIBRARIES NAMES ${wxWidgets_LIB_DIR}/libwxzlib-2.9.a libwxzlib.a PATHS ${wxWidgets_ROOT_DIR}/lib/ PATH_SUFFIXES gcc_dll DOC "location of wxzlib library file")
+	find_file(ZLIB_LIBRARIES NAMES ${wxWidgets_LIB_DIR}/libwxzlib-2.8.a ZLIB_LIBRARIES NAMES ${wxWidgets_LIB_DIR}/libwxzlib-2.9.a libwxzlib.a PATHS ${wxWidgets_ROOT_DIR}/lib/ PATH_SUFFIXES gcc_dll gcc_lib DOC "location of wxzlib library file")
 endif(ZLIB_FOUND)
 
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}

=== modified file 'pcbnew/ioascii.cpp'
--- pcbnew/ioascii.cpp	2010-12-08 20:12:46 +0000
+++ pcbnew/ioascii.cpp	2011-01-14 01:37:07 +0000
@@ -548,6 +548,23 @@
             GetBoard()->GetBoardDesignSettings()->m_SolderPasteMarginRatio = atof( data );
             continue;
         }
+
+        if( stricmp( Line, "GridOrigin" ) == 0 )
+        {
+            int Ox = 0;
+            int Oy = 0;
+
+            Ox = atoi( data );
+            data = strtok( NULL, " =\n\r" );
+
+            if ( data )
+                Oy = atoi( data );
+
+            GetScreen()->m_GridOrigin.x = Ox;
+            GetScreen()->m_GridOrigin.y = Oy;
+
+            continue;
+        }
 
 #endif
     }
@@ -686,6 +703,14 @@
         fprintf( aFile,
                  "Pad2PasteClearanceRatio %g\n",
                  aBoard->GetBoardDesignSettings()->m_SolderPasteMarginRatio );
+
+    if ( aFrame->GetScreen()->m_GridOrigin != wxPoint( 0, 0 ) )
+    {
+        fprintf( aFile,
+                 "GridOrigin %d %d\n",
+                 aFrame->GetScreen()->m_GridOrigin.x,
+                 aFrame->GetScreen()->m_GridOrigin.y );
+    }
 
     fprintf( aFile,
              "AuxiliaryAxisOrg %d %d\n",