[graphite2/f16: 3/3] Merge branch 'master' into f16

[Nicholas van Oudtshoorn]

commit 53b6aad8d8e9e2569482acc8b93d642cebd03323
Merge: ef4e087 b2b1c01
Author: Nicholas van Oudtshoorn <vanoudt at gmail.com>
Date:   Fri Sep 23 09:55:01 2011 +0800

    Merge branch 'master' into f16
    
    Conflicts:
    	graphite2.spec

 .gitignore     |    1 +
 graphite2.spec |    6 ++++--
 sources        |    2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)
---