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

diff --cc ChangeLog
index 9074e753b26ef53256ca0b424b2775e22b9b4152,4c61e7015ed1a666e916c1f8913676be57725a9e..13ec0fb4a763abdefe000678e5a9f487584fd16e
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,9 -1,14 +1,17 @@@
 -# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
 -# $Id: $
 +# Copyright 2002-2008 Gentoo Foundation; 2008 Chris Gianelloni, Andrew Gaffney
 +# Distributed under the GPL v2
 +
 +  31 Oct 2008; Chris Gianelloni <wolf31o2@wolf31o2.org> catalyst:
 +  Kicking out a 2.0.6.901 release for testing.
  
+   29 Sep 2008; Andrew Gaffney <agaffney@gentoo.org>
+   modules/generic_stage_target.py:
+   Automatically prepend build dir path to livecd/iso if it's not an absolute
+   path
+ 
+   28 Sep 2008; Andrew Gaffney <agaffney@gentoo.org> TODO:
+   Update TODO with placeholder idea
+ 
    07 Sep 2008; Andrew Gaffney <agaffney@gentoo.org> catalyst,
    +modules/catalyst/util.py:
    Create catalyst.util module with capture_traceback() and print_traceback()