glamor: Changes to 'master'

[Zhigang Gong]

 src/glamor_trapezoid.c |    3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 83f87f3bb8a0c18c3218695b1eb14065a82e8819
Author: Michel Dänzer <michel.daenzer at amd.com>
Date:   Fri Sep 20 10:41:10 2013 +0200

    Reset traps_count and ptrap when necessary for the next trapezoid cliprect
    
    Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=64912
    Signed-off-by: Michel Dänzer <michel.daenzer at amd.com>
    Reviewed-by: He Junyan <junyan.he at inbox.com>
    Reviewed-by: Zhigang Gong <zhigang.gong at linux.intel.com>