Merge commit 'origin/master' into adv

Conflicts:

	extlinux/extlinux.c

15 files changed, 15 insertions, 15 deletions

diff --git a/com32/include/syslinux/adv.h b/com32/include/syslinux/adv.h
index a31712bb..d64b89cb 100644
--- a/com32/include/syslinux/adv.h
+++ b/com32/include/syslinux/adv.h
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------- *
  *
- *   Copyright 2007 H. Peter Anvin - All Rights Reserved
+ *   Copyright 2007-2008 H. Peter Anvin - All Rights Reserved
  *
  *   Permission is hereby granted, free of charge, to any person
  *   obtaining a copy of this software and associated documentation
diff --git a/com32/include/syslinux/advconst.h b/com32/include/syslinux/advconst.h
index f9d55aac..156a11b5 100644
--- a/com32/include/syslinux/advconst.h
+++ b/com32/include/syslinux/advconst.h
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------- *
  *   
- *   Copyright 2007 H. Peter Anvin - All Rights Reserved
+ *   Copyright 2007-2008 H. Peter Anvin - All Rights Reserved
  *
  *   Permission is hereby granted, free of charge, to any person
  *   obtaining a copy of this software and associated documentation
diff --git a/com32/include/syslinux/boot.h b/com32/include/syslinux/boot.h
index 80ba74d4..87c05e99 100644
--- a/com32/include/syslinux/boot.h
+++ b/com32/include/syslinux/boot.h
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------- *
  *
- *   Copyright 2007 H. Peter Anvin - All Rights Reserved
+ *   Copyright 2007-2008 H. Peter Anvin - All Rights Reserved
  *
  *   Permission is hereby granted, free of charge, to any person
  *   obtaining a copy of this software and associated documentation
diff --git a/com32/include/syslinux/bootpm.h b/com32/include/syslinux/bootpm.h
index cfe28103..be0d178b 100644
--- a/com32/include/syslinux/bootpm.h
+++ b/com32/include/syslinux/bootpm.h
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------- *
  *
- *   Copyright 2007 H. Peter Anvin - All Rights Reserved
+ *   Copyright 2007-2008 H. Peter Anvin - All Rights Reserved
  *
  *   Permission is hereby granted, free of charge, to any person
  *   obtaining a copy of this software and associated documentation
diff --git a/com32/include/syslinux/bootrm.h b/com32/include/syslinux/bootrm.h
index 2a3b618b..6454129d 100644
--- a/com32/include/syslinux/bootrm.h
+++ b/com32/include/syslinux/bootrm.h
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------- *
  *
- *   Copyright 2007 H. Peter Anvin - All Rights Reserved
+ *   Copyright 2007-2008 H. Peter Anvin - All Rights Reserved
  *
  *   Permission is hereby granted, free of charge, to any person
  *   obtaining a copy of this software and associated documentation
diff --git a/com32/include/syslinux/config.h b/com32/include/syslinux/config.h
index 8b2ed4c9..82225c12 100644
--- a/com32/include/syslinux/config.h
+++ b/com32/include/syslinux/config.h
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------- *
  *
- *   Copyright 2007 H. Peter Anvin - All Rights Reserved
+ *   Copyright 2007-2008 H. Peter Anvin - All Rights Reserved
  *
  *   Permission is hereby granted, free of charge, to any person
  *   obtaining a copy of this software and associated documentation
diff --git a/com32/include/syslinux/features.h b/com32/include/syslinux/features.h
index e3da12e2..f2317dd5 100644
--- a/com32/include/syslinux/features.h
+++ b/com32/include/syslinux/features.h
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------- *
  *
- *   Copyright 2007 H. Peter Anvin - All Rights Reserved
+ *   Copyright 2007-2008 H. Peter Anvin - All Rights Reserved
  *
  *   Permission is hereby granted, free of charge, to any person
  *   obtaining a copy of this software and associated documentation
diff --git a/com32/include/syslinux/idle.h b/com32/include/syslinux/idle.h
index d8f015c7..4c5947b7 100644
--- a/com32/include/syslinux/idle.h
+++ b/com32/include/syslinux/idle.h
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------- *
  *
- *   Copyright 2005-2007 H. Peter Anvin - All Rights Reserved
+ *   Copyright 2005-2008 H. Peter Anvin - All Rights Reserved
  *
  *   Permission is hereby granted, free of charge, to any person
  *   obtaining a copy of this software and associated documentation
diff --git a/com32/include/syslinux/io.h b/com32/include/syslinux/io.h
index a8d05cc5..329377d2 100644
--- a/com32/include/syslinux/io.h
+++ b/com32/include/syslinux/io.h
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------- *
  *
- *   Copyright 2007 H. Peter Anvin - All Rights Reserved
+ *   Copyright 2007-2008 H. Peter Anvin - All Rights Reserved
  *
  *   Permission is hereby granted, free of charge, to any person
  *   obtaining a copy of this software and associated documentation
diff --git a/com32/include/syslinux/linux.h b/com32/include/syslinux/linux.h
index 6b2fecbc..463b49f5 100644
--- a/com32/include/syslinux/linux.h
+++ b/com32/include/syslinux/linux.h
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------- *
  *
- *   Copyright 2007 H. Peter Anvin - All Rights Reserved
+ *   Copyright 2007-2008 H. Peter Anvin - All Rights Reserved
  *
  *   Permission is hereby granted, free of charge, to any person
  *   obtaining a copy of this software and associated documentation
diff --git a/com32/include/syslinux/pxe.h b/com32/include/syslinux/pxe.h
index 3b9108e9..7550817f 100644
--- a/com32/include/syslinux/pxe.h
+++ b/com32/include/syslinux/pxe.h
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------- *
  *
- *   Copyright 2007 H. Peter Anvin - All Rights Reserved
+ *   Copyright 2007-2008 H. Peter Anvin - All Rights Reserved
  *
  *   Permission is hereby granted, free of charge, to any person
  *   obtaining a copy of this software and associated documentation
diff --git a/com32/include/syslinux/reboot.h b/com32/include/syslinux/reboot.h
index 7a8bc108..e589982f 100644
--- a/com32/include/syslinux/reboot.h
+++ b/com32/include/syslinux/reboot.h
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------- *
  *
- *   Copyright 2007 H. Peter Anvin - All Rights Reserved
+ *   Copyright 2007-2008 H. Peter Anvin - All Rights Reserved
  *
  *   Permission is hereby granted, free of charge, to any person
  *   obtaining a copy of this software and associated documentation
diff --git a/com32/include/syslinux/resolve.h b/com32/include/syslinux/resolve.h
index 96c4365c..0589c33b 100644
--- a/com32/include/syslinux/resolve.h
+++ b/com32/include/syslinux/resolve.h
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------- *
  *
- *   Copyright 2007 H. Peter Anvin - All Rights Reserved
+ *   Copyright 2007-2008 H. Peter Anvin - All Rights Reserved
  *
  *   Permission is hereby granted, free of charge, to any person
  *   obtaining a copy of this software and associated documentation
diff --git a/com32/include/syslinux/vesacon.h b/com32/include/syslinux/vesacon.h
index 90ab99f8..dad9fb57 100644
--- a/com32/include/syslinux/vesacon.h
+++ b/com32/include/syslinux/vesacon.h
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------- *
  *
- *   Copyright 2007 H. Peter Anvin - All Rights Reserved
+ *   Copyright 2007-2008 H. Peter Anvin - All Rights Reserved
  *
  *   Permission is hereby granted, free of charge, to any person
  *   obtaining a copy of this software and associated documentation
diff --git a/com32/include/syslinux/video.h b/com32/include/syslinux/video.h
index 237552fa..737c742b 100644
--- a/com32/include/syslinux/video.h
+++ b/com32/include/syslinux/video.h
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------- *
  *
- *   Copyright 2007 H. Peter Anvin - All Rights Reserved
+ *   Copyright 2007-2008 H. Peter Anvin - All Rights Reserved
  *
  *   Permission is hereby granted, free of charge, to any person
  *   obtaining a copy of this software and associated documentation