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

[Adam Jackson]

commit 4077056057fa8727789dc8d9cf31f74dc883b84d
Merge: e0b1553 223fa3a
Author: Adam Jackson <ajax at redhat.com>
Date:   Tue Apr 15 17:32:50 2014 -0400

    Merge branch 'master' into f20

 mesa.spec |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)
---