Merge with master
authorJonas Fonseca <fonseca@diku.dk>
Sun, 24 Sep 2006 23:13:51 +0000 (01:13 +0200)
committerJonas Fonseca <fonseca@antimatter.localdomain>
Sun, 24 Sep 2006 23:13:51 +0000 (01:13 +0200)

Trivial merge