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

[Igor Gnatenko]

commit 635d534dda7da780f713fd4b563112e3ff0d3dd7
Merge: a5a4159 a70dede
Author: Igor Gnatenko <i.gnatenko.brain at gmail.com>
Date:   Sat Apr 19 19:01:53 2014 +0400

    Merge branch 'master' into f20

 .gitignore |    1 +
 mesa.spec  |    9 ++++++---
 sources    |    2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)
---