[cairo/f18: 5/5] Merge branch 'master' into f18

[Adam Jackson]

commit 73fb8273badda8358b17b4dce1813aadf3e688a7
Merge: f468549 768b121
Author: Adam Jackson <ajax at redhat.com>
Date:   Wed Oct 31 16:21:00 2012 -0400

    Merge branch 'master' into f18
    
    Conflicts:
    	cairo.spec

 ...Don-t-crash-when-swapping-a-0-sized-glyph.patch |   43 ++++++++++++++++++++
 ...Don-t-crash-when-swapping-a-0-sized-glyph.patch |   43 ++++++++++++++++++++
 cairo.spec                                         |   11 +++++-
 3 files changed, 96 insertions(+), 1 deletions(-)
---