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

[Adam Jackson]

commit a5a4159bbf4ef08f0d2ffdef0a71d143a374863f
Merge: 4077056 79a76ee
Author: Adam Jackson <ajax at redhat.com>
Date:   Wed Apr 16 10:57:14 2014 -0400

    Merge branch 'master' into f20

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