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

[bonzini]

commit 683c826120694fb98da838f8ed9a4d32ad30fcde
Merge: f26eee7 ddfd4f9
Author: Paolo Bonzini <pbonzini at redhat.com>
Date:   Fri Mar 8 09:27:15 2013 +0100

    Merge branch 'f18'
    
    Conflicts:
    	vgabios.spec

 0008-vgabios-Ensure-pcir4-is-aligned.patch |   19 +++++++++++++++++++
 vgabios.spec                               |   14 ++++++++++----
 2 files changed, 29 insertions(+), 4 deletions(-)
---
diff --cc vgabios.spec
index 35b596f,14b5df3..8be6e13
--- a/vgabios.spec
+++ b/vgabios.spec
@@@ -1,6 -1,6 +1,6 @@@
  Name:		vgabios
  Version:	0.6c
--Release:	7%{?dist}
++Release:	8%{?dist}
  Summary:	LGPL implementation of a vga video bios
  
  Group:		Applications/Emulators		
@@@ -69,9 -72,9 +72,12 @@@ rm -rf $RPM_BUILD_ROO
  
  
  %changelog
 -* Thu Jan 10 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