From: Jonas Fonseca <fonseca@diku.dk>
Date: Mon, 18 Sep 2006 16:21:29 +0000 (+0200)
Subject: Merge with master
X-Git-Url: https://git.distorted.org.uk/~mdw/tig/commitdiff_plain/168352eaabb19cdcaeaa7e0d4ef6f97b103e7b29

Merge with master
---

168352eaabb19cdcaeaa7e0d4ef6f97b103e7b29