Merge branch 'master' of git+ssh://git@wolf31o2.org/projs/catalyst

Conflicts:
	ChangeLog

diff --cc ChangeLog
index 832764e0f73576b8450b10ed74afe1cfeb76e729,c0abbebe63ea28702888d89141974bb3af3cd1a4..8f60d9c2265c8232e3af4c7eb6aeeab7cd84d946
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,16 -1,9 +1,19 @@@
  # Copyright 2002-2008 Gentoo Foundation; 2008 Chris Gianelloni, Andrew Gaffney
  # Distributed under the GPL v2
  
 +  21 Dec 2008; Andrew Gaffney <agaffney@gentoo.org>
 +  -livecd/cdtar/isolinux-3.09-cdtar.tar.bz2,
 +  -livecd/cdtar/isolinux-3.09-memtest86+-cdtar.tar.bz2:
 +  Remove old isolinux-3.09 cdtar files
 +
 +  21 Dec 2008; Andrew Gaffney <agaffney@gentoo.org>
 +  +livecd/cdtar/isolinux-3.72-cdtar.tar.bz2,
 +  +livecd/cdtar/isolinux-3.72-memtest86+-cdtar.tar.bz2:
 +  Update cdtar files to isolinux-3.72 and latest memtest86+-2.10
 +
+   19 Dec 2008; Chris Gianelloni <wolf31o2@wolf31o2.org> catalyst:
+   Marking this 2.0.6.903 for testing.
+ 
    12 Dec 2008; Andrew Gaffney <agaffney@gentoo.org>
    targets/netboot2/netboot2-controller.sh:
    Disable copying of nb-busybox.cf since it isn't used anyway