Merge with master
authorJonas Fonseca <fonseca@diku.dk>
Mon, 18 Sep 2006 16:21:29 +0000 (18:21 +0200)
committerJonas Fonseca <fonseca@antimatter.localdomain>
Mon, 18 Sep 2006 16:21:29 +0000 (18:21 +0200)

Trivial merge