Merge with master
authorJonas Fonseca <fonseca@diku.dk>
Tue, 16 May 2006 15:36:55 +0000 (17:36 +0200)
committerJonas Fonseca <fonseca@antimatter.localdomain>
Tue, 16 May 2006 15:36:55 +0000 (17:36 +0200)

Trivial merge