From: Jonas Fonseca <fonseca@diku.dk>
Date: Wed, 14 Jun 2006 20:28:24 +0000 (+0200)
Subject: Merge with master
X-Git-Url: https://git.distorted.org.uk/~mdw/tig/commitdiff_plain/daaae1af3f1fe5a18a106e5c42ac6ef6fa4fa9d2

Merge with master
---

daaae1af3f1fe5a18a106e5c42ac6ef6fa4fa9d2