Index: CairoOutputDev.h
===================================================================
RCS file: /cvs/poppler/poppler/poppler/CairoOutputDev.h,v
retrieving revision 1.8
diff -u -p -r1.8 CairoOutputDev.h
--- CairoOutputDev.h	30 Oct 2005 20:29:05 -0000	1.8
+++ CairoOutputDev.h	16 Nov 2005 22:50:23 -0000
@@ -15,7 +15,7 @@
 #endif
 
 #include "goo/gtypes.h"
-#include <cairo/cairo-ft.h>
+#include <cairo-ft.h>
 #include "OutputDev.h"
 #include "GfxState.h"
 
Index: TextOutputDev.cc
===================================================================
RCS file: /cvs/poppler/poppler/poppler/TextOutputDev.cc,v
retrieving revision 1.14
diff -u -p -r1.14 TextOutputDev.cc
--- TextOutputDev.cc	30 Oct 2005 20:29:05 -0000	1.14
+++ TextOutputDev.cc	16 Nov 2005 22:50:23 -0000
@@ -3482,8 +3482,8 @@ void TextBlock::visitSelection(TextSelec
       stop_y = selection->y1;
     }
 
-    if (selection->x1 > p->xMin && selection->y1 > p->yMin ||
-	selection->x2 > p->xMin && selection->y2 > p->yMin)
+    if ((selection->x1 > p->xMin && selection->y1 > p->yMin ||
+	selection->x2 > p->xMin && selection->y2 > p->yMin) && (begin != NULL))
       end = p->next;
   }