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

[Nicholas van Oudtshoorn]

commit d3f6eda4ee63cdeea81707532206ad739d423d3e
Merge: 2ab81bc 898dbb9
Author: Nicholas van Oudtshoorn <vanoudt at gmail.com>
Date:   Fri Aug 26 17:29:17 2011 +0800

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

 graphite2.spec |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)
---
diff --cc graphite2.spec
index 6ee9455,01c0804..043ef4f
--- a/graphite2.spec
+++ b/graphite2.spec
@@@ -51,7 -51,6 +51,7 @@@ rm -f $RPM_BUILD_ROOT/%{_libdir}/*.l
  %files
  %defattr(-,root,root,-)
  %doc LICENSE COPYING ChangeLog doc/manual.html
- %{_bindir}/comparerenderer
++>>>>>>> master
  %{_bindir}/gr2fonttest
  %{_libdir}/libgraphite2.so.2.0.0