Merge branch 'devel'

diff --combined Makefile
index d975e4ed9b2b2f8fe191e433f229d116a684a9c9,4c35c6758111650976534d149e67210da48fa205..336ac527b0b1c718eedd9abd859cc07f785efaa4
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -2,7 -2,7 +2,7 @@@
  
  include Config
  
 -VERSION = 1.3.14
 +VERSION = 1.3.16
  # Debug mode (spam/verbose)
  DEBUG = 0
  # make install vars
@@@ -83,7 -83,8 +83,8 @@@ HOSTCFLAGS = -O2 $(CFLAGS) -Wall -I/usr
  
  OBJS = second/crt0.o second/yaboot.o second/cache.o second/prom.o second/file.o \
        second/partition.o second/fs.o second/cfg.o second/setjmp.o second/cmdline.o \
-       second/fs_of.o second/fs_ext2.o second/fs_iso.o second/iso_util.o \
+       second/fs_of.o second/fs_ext2.o second/fs_iso.o second/fs_swap.o \
+       second/iso_util.o \
        lib/nosys.o lib/string.o lib/strtol.o lib/vsprintf.o lib/ctype.o lib/malloc.o lib/strstr.o
  
  ifeq ($(USE_MD5_PASSWORDS),y)