Merge with master
authorJonas Fonseca <fonseca@diku.dk>
Tue, 16 May 2006 18:10:42 +0000 (20:10 +0200)
committerJonas Fonseca <fonseca@antimatter.localdomain>
Tue, 16 May 2006 18:10:42 +0000 (20:10 +0200)

Trivial merge