[pixman/f17: 20/20] Merge branch 'f18' into f17

[Adam Jackson]

commit 7fa901c6e42c6606f61c8802fde704aa8fbc2c02
Merge: 068d33c fdb2ff8
Author: Adam Jackson <ajax at redhat.com>
Date:   Tue Feb 12 17:32:34 2013 -0500

    Merge branch 'f18' into f17
    
    Conflicts:
    	pixman.spec

 .gitignore  |   28 +--------------------------
 pixman.spec |   61 ++++++++++++++++++++++++++++++++++++++++++++++++++++------
 sources     |    2 +-
 3 files changed, 56 insertions(+), 35 deletions(-)
---