[mesa/f19: 4/4] Merge branch 'master' into f19

[Igor Gnatenko]

commit 1331db914b9ab756e34be26f81e442caad56de75
Merge: 3e12a53 bbef9c7
Author: Igor Gnatenko <i.gnatenko.brain at gmail.com>
Date:   Thu Nov 28 14:29:03 2013 +0400

    Merge branch 'master' into f19
    
    Signed-off-by: Igor Gnatenko <i.gnatenko.brain at gmail.com>
    
    Conflicts:
    	.gitignore
    	mesa.spec
    	sources

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