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

[Igor Gnatenko]

commit 66a1561bbc4779ec8e286f730a069001e9f1aac4
Merge: 7a867fe bbef9c7
Author: Igor Gnatenko <i.gnatenko.brain at gmail.com>
Date:   Thu Nov 28 14:25:37 2013 +0400

    Merge branch 'master' into f20
    
    Conflicts:
    	.gitignore
    	mesa.spec
    	sources

 .gitignore                                         |    1 +
 ...do-not-create-a-new-context-for-msaa-copy.patch |  313 --------------------
 mesa.spec                                          |    7 +-
 sources                                            |    2 +-
 4 files changed, 7 insertions(+), 316 deletions(-)
---