# HG changeset patch
# User Martin Geisler <mg@lazybytes.net>
# Date 1261006346 -3600
# Node ID a43ae5777221e02b5910677c1e6f150bc0613a39
# Parent  b1982715c435c0c987806596dfe20056070e443a# Parent  f1bf64abcb1b2bf5842acfbecc3606f8bced4d48
Merge with stable

diff -r b1982715c435 -r a43ae5777221 doc/Makefile
--- a/doc/Makefile	Wed Dec 16 16:46:12 2009 -0600
+++ b/doc/Makefile	Thu Dec 17 00:32:26 2009 +0100
@@ -6,7 +6,7 @@
 MANDIR=$(PREFIX)/share/man
 INSTALL=install -c -m 644
 PYTHON=python
-RST2HTML=$(shell which rst2html 2> /dev/null || which rst2html.py)
+RST2HTML=$(shell which rst2html 2> /dev/null || echo rst2html.py)
 
 export LC_ALL=C