[vgabios: 2/2] Merge branch 'f18'

[bonzini]

commit 6ec13e9a36ccf711cda48e150e4f27f30a34deac
Merge: 683c826 32d04cf
Author: Paolo Bonzini <pbonzini at redhat.com>
Date:   Fri Mar 8 09:56:46 2013 +0100

    Merge branch 'f18'
    
    Conflicts:
    	vgabios.spec

 0008-vgabios-Ensure-pcir4-is-aligned.patch |    2 +-
 vgabios.spec                               |    5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)
---
diff --cc vgabios.spec
index 8be6e13,c8888e9..abc3515
--- a/vgabios.spec
+++ b/vgabios.spec
@@@ -1,6 -1,6 +1,6 @@@
  Name:		vgabios
  Version:	0.6c
--Release:	8%{?dist}
++Release:	9%{?dist}
  Summary:	LGPL implementation of a vga video bios
  
  Group:		Applications/Emulators		
@@@ -72,12 -72,12 +72,15 @@@ rm -rf $RPM_BUILD_ROO
  
  
  %changelog
 -* Fri Mar 8 2013 Paolo Bonzini <pbonzini at redhat.com> - 0.6c-8
++* Fri Mar 8 2013 Paolo Bonzini <pbonzini at redhat.com> - 0.6c-9
+ - Regenerate patch 8
+ 
 -* Fri Mar 8 2013 Paolo Bonzini <pbonzini at redhat.com> - 0.6c-7
 +* Fri Mar 8 2013 Paolo Bonzini <pbonzini at redhat.com> - 0.6c-8
  - Ensure PCIR is aligned to 4 bytes
  
 +* Fri Feb 15 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6c-7
 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 +
  * Thu Jan 10 2013 Paolo Bonzini <pbonzini at redhat.com> - 0.6c-6
  - Complete implementation for int 10h AH=11h