[pungi: 2/2] Merge branch 'f16'

[Dennis Gilmore]

commit 2859b66cf7d5649b870d4b3cfa040e5cdba0b579
Merge: a0bd6f0 7c348de
Author: Dennis Gilmore <dennis at ausil.us>
Date:   Mon Jan 30 12:47:16 2012 -0600

    Merge branch 'f16'
    
    Conflicts:
    	pungi.spec

 .gitignore |    1 +
 pungi.spec |    7 +++++--
 sources    |    2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)
---
diff --cc pungi.spec
index 6b67bfe,e5eb9d8..d110aa3
--- a/pungi.spec
+++ b/pungi.spec
@@@ -60,13 -56,9 +60,16 @@@ rm -rf $RPM_BUILD_ROO
  
  
  %changelog
 -* Wed Jul 27 2011 Dennis Gilmore <dennis at ausil.us> - 2.9-1
++* Mon Jan 30 2012 Dennis Gilmore <dennis at ausil.us> - 2.9-1
+ - pass isfinal rather than is_beta to lorax 
+ 
 +* Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.8-3
 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 +
 +* Thu Oct 27 2011 Will Woods <wwoods at redhat.com> - 2.8-2
 +- Fix DVD builds for ppc/ppc64
 +- Use a consistent ISO label so the bootloader will work (#732298)
 +
  * Mon Jul 18 2011 Jesse Keating <jkeating at redhat.com> - 2.8-1
  - Always re-init the yum object (#717089)