[appliance-tools: 9/9] Merge remote branch 'origin/f12/master'

[Adam Tkac]

commit eb8a6c5350c3e57095d0b39cb7123c6307a17ba9
Merge: 9ab5438 a18aab4
Author: Adam Tkac <atkac at redhat.com>
Date:   Fri Aug 20 14:52:03 2010 +0200

    Merge remote branch 'origin/f12/master'
    
    Conflicts:
    	.gitignore
    	appliance-tools.spec
    
    Signed-off-by: Adam Tkac <atkac at redhat.com>

 .gitignore           |    2 +-
 appliance-tools.spec |   15 +++++++++++----
 sources              |    2 +-
 3 files changed, 13 insertions(+), 6 deletions(-)
---
diff --cc appliance-tools.spec
index e8385ed,72cec66..5770014
--- a/appliance-tools.spec
+++ b/appliance-tools.spec
@@@ -59,8 -59,10 +59,15 @@@ rm -rf $RPM_BUILD_ROO
  %{python_sitelib}/ec2convert/*.pyc
  
  %changelog
 -* Tue Feb 09 2010 David Huff <dhuff at redhat.com> - 004.5-1
 -- Fixed error while installing grub
 -- Fixed issue with Fedora 12 using dracut to generate initrd
 -- Fixed issue with Fedora 12 parted error
++* Fri Aug 20 2010 Adam Tkac <atkac redhat com> - 004.5-1
++- rebuild to ensure NVR in F14 is bigger than in F13
++- merge following changes from F12 branch [David Huff]:
++  - Fixed error while installing grub
++  - Fixed issue with Fedora 12 using dracut to generate initrd
++  - Fixed issue with Fedora 12 parted error
++
 +* Wed Jul 21 2010 David Malcolm <dmalcolm at redhat.com> - 004.4-4
 +- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild
  
  * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 004.4-3
  - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild