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

[Nicholas van Oudtshoorn]

commit 6513df3807affd81da9eef28c2e95825f9bd5c3f
Merge: 32e8fdb 898dbb9
Author: Nicholas van Oudtshoorn <vanoudt at gmail.com>
Date:   Fri Aug 26 17:31:49 2011 +0800

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

 graphite2.spec |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)
---