Merge branch 'master' into chaz

diff --git a/obrender/image.c b/obrender/image.c
index 57bccd2120925cd1eec1313749f4dfe6e49ef10e..8ff9bf106b0ef204b339a77527dafcc613934ea8 100644 (file)
--- a/obrender/image.c
+++ b/obrender/image.c
@@ -26,7 +26,6 @@
 #endif
 #ifdef USE_LIBRSVG
 #include <librsvg/rsvg.h>
-#include <librsvg/rsvg-cairo.h>
 #endif
 
 #include <glib.h>