Merge with master
authorJonas Fonseca <fonseca@diku.dk>
Mon, 29 May 2006 19:41:01 +0000 (21:41 +0200)
committerJonas Fonseca <fonseca@antimatter.localdomain>
Mon, 29 May 2006 19:41:01 +0000 (21:41 +0200)

Trivial merge