[mesa/f16: 2/2] Merge branch 'master' into f16

[Adam Jackson]

commit 9143bb16de474ac95a4cc8827ee0865e4cd27981
Merge: def34f5 82500f9
Author: Adam Jackson <ajax at redhat.com>
Date:   Fri Oct 28 20:30:37 2011 -0400

    Merge branch 'master' into f16
    
    Conflicts:
    	mesa.spec

 mesa-7.11-intel-swap-event.patch |   12 ++++++++++++
 mesa.spec                        |    7 +++++--
 2 files changed, 17 insertions(+), 2 deletions(-)
---