[xorg-x11-drv-mga/f18: 8/8] Merge branch 'f19' into f18

[Adam Jackson]

commit 7457761bfe5cc224cd58da6805738d7a9b4a9517
Merge: 80ccc66 b5e5fe9
Author: Adam Jackson <ajax at redhat.com>
Date:   Wed Apr 3 16:17:26 2013 -0400

    Merge branch 'f19' into f18
    
    Signed-off-by: Adam Jackson <ajax at redhat.com>
    
    Conflicts:
    	xorg-x11-drv-mga.spec

 mga-1.6.2-fix-kms-matching.patch |   49 ++++++++++++++++++++++++++++++++++++++
 xorg-x11-drv-mga.spec            |   27 +++++++++++++++++----
 2 files changed, 71 insertions(+), 5 deletions(-)
---